Merge remote-tracking branch 'origin/master'

fastbee-service/fastbee-system-service/src/main/java/com/fastbee/system/mapper/SysDistrictMapper.java

@@ -60,4 +60,7 @@ public interface SysDistrictMapper extends BaseMapper<SysDistrict>
      * @return 结果
      */
     public int deleteSysDistrictByIds(Long[] ids);
+
+    SysDistrict selectSysDistrictByCode(Long areaCode);
+
 }

fastbee-service/fastbee-system-service/src/main/java/com/fastbee/system/service/ISysDistrictService.java

@@ -66,4 +66,6 @@ public interface ISysDistrictService
      */
     List<SysDistrict> selectSysDistrictTreeByCode(Long areaCode);
 
+    SysDistrict selectSysDistrictByCode(Long areaCode);
+
 }

fastbee-service/fastbee-system-service/src/main/java/com/fastbee/system/service/impl/SysDeptServiceImpl.java

@@ -289,9 +289,6 @@ public class SysDeptServiceImpl implements ISysDeptService
             //单个行政区划代码列表
             JSONArray administrativeArea = JSONUtil.parseArray(item);
             //拆解出每个行政区划代码里面的镇或村
-//            if(administrativeArea.size()!=5){
-//                throw new ServiceException("项目行政区域代码多选列表的元素长度必须为5，到达村级别！");
-//            }
             //保存项目省代码列表
             provincialCodeList.add(administrativeArea.get(0).toString());
             //保存项目市代码列表

fastbee-service/fastbee-system-service/src/main/java/com/fastbee/system/service/impl/SysDistrictServiceImpl.java

@@ -41,6 +41,7 @@ public class SysDistrictServiceImpl implements ISysDistrictService
     @Override
     public SysDistrict selectSysDistrictById(Long id)
     {
+
         return sysDistrictMapper.selectSysDistrictById(id);
     }
 
@@ -202,6 +203,14 @@ public class SysDistrictServiceImpl implements ISysDistrictService
         return Collections.singletonList(sysDistricts.get(0));
     }
 
+    /**
+     * 根据地区代码获取行政区划信息
+     */
+    @Override
+    public SysDistrict selectSysDistrictByCode(Long areaCode) {
+        return sysDistrictMapper.selectSysDistrictByCode(areaCode);
+    }
+
     /**
      * 查询行政区划树状列表
      */

fastbee-service/fastbee-system-service/src/main/resources/mapper/system/SysDistrictMapper.xml

@@ -41,6 +41,9 @@
         <include refid="selectSysDistrictVo"/>
         where id = #{id}
     </select>
+    <select id="selectSysDistrictByCode" resultType="com.fastbee.system.domain.SysDistrict">
+        <include refid="selectSysDistrictVo"/> where adcode = #{code}
+    </select>
 
     <insert id="insertSysDistrict" parameterType="SysDistrict" useGeneratedKeys="true" keyProperty="id">
         insert into sys_district