小区下拉选sql修改、必填项修改

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GAreaBo.java

@@ -45,7 +45,6 @@ public class GAreaBo extends BaseEntity {
      * 负责工长
      */
     @ApiModelProperty(value = "负责工长", required = true)
-    @NotNull(message = "负责工长不能为空", groups = { AddGroup.class, EditGroup.class })
     private String userId;
     /**
      * 释放人

ruoyi-gas/src/main/resources/mapper/GAreaMapper.xml

@@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getArea" resultType="com.ruoyi.gas.domain.vo.GAreaVo">
         SELECT
+        DISTINCT
         a.*
         FROM
         g_area as a join g_network_relation as b on a.id = b.regulator_box_id AND b.del_flag = '0'