Merge remote-tracking branch 'origin/master'

tenant/organization/src/main/java/com/jzg/organization/client/OrgClient.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 
-@FeignClient(name="jzg-org")
+@FeignClient(name="${spring.application.name:jzg-organization}")
 public interface OrgClient {
 
     @PostMapping("/ptlAgreementDispatch/getAgreementDispatch")

tenant/organization/src/main/java/com/jzg/organization/controller/AreaController.java

@@ -7,10 +7,7 @@ import com.jzg.commons.entity.vo.SysAreaVo;
 import com.jzg.organization.service.SysAreaService;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -34,7 +31,8 @@ public class AreaController {
 
     @Schema(description = "根据地址与身份证查询省市区")
     @GetMapping(value = "queryByAddress")
-    public HttpResult<PersonAreaVo> queryByAddress(String address, String idCard) {
-        return HttpResult.ok(sysAreaService.queryByAddress(address,idCard));
+    public HttpResult<PersonAreaVo> queryByAddress(@RequestParam("address") String address,
+                                                   @RequestParam("idCard") String idCard) {
+        return HttpResult.ok(sysAreaService.queryByAddress(address, idCard));
     }
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysAreaServiceImpl.java

@@ -60,6 +60,10 @@ public class SysAreaServiceImpl extends ServiceImpl<SysAreaMapper, SysArea> impl
     @Override
     public PersonAreaVo queryByAddress(String address, String idcard) {
         PersonAreaVo personAreaVo = new PersonAreaVo();
+        // 参数校验
+        if (idcard == null || idcard.length() < 6) {
+            return personAreaVo;
+        }
         //获取县级全部区划数据
         List<SysArea> sysAreaVos = this.queryByLevel(3);
         //被保人 赛选出的地址条件
@@ -70,6 +74,7 @@ public class SysAreaServiceImpl extends ServiceImpl<SysAreaMapper, SysArea> impl
         //获取省级的区划
         if (!collect.isEmpty()) {
             List<SysArea> provincesArea = collect.stream()
+                    .filter(item -> item.getAreaCode().length() >= 4 && item.getAreaCode().substring(0, 4).equals(provincesCode))
                     .filter(item -> item.getAreaCode().substring(0, 4).equals(provincesCode))
                      .collect(Collectors.toList());
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -500,10 +500,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public HttpResult<Boolean> deleteUserInfo(IsDeleteVo isDeleteVo) {
         for (String id : isDeleteVo.getIds()) {
             SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(id);
-            sysDeptService.checkChangeDept(sysUserJzgInfo.getUserId());
             if (sysUserJzgInfo == null) {
-                throw new SystemException("该用户不存在");
+                throw new SystemException("该用户不存在-----" + id);
             }
+            sysDeptService.checkChangeDept(sysUserJzgInfo.getUserId());
             sysUserJzgInfoService.removeById(id);
         }
         return HttpResult.ok("删除成功");