Merge remote-tracking branch 'origin/dev/ez-security210625' into dev/ez-security210625

common/src/main/java/com/lantone/common/dto/DownBoxRegionDTO.java

@@ -13,7 +13,7 @@ import lombok.Data;
 public class DownBoxRegionDTO {
 
     @ApiModelProperty(value = "病区编号")
-    private Long id;
+    private Long name;
     @ApiModelProperty(value = "病区名称")
-    private String name;
+    private String val;
 }

security-center/src/main/java/com/lantone/security/facade/HospitalManagementFacade.java

@@ -488,7 +488,8 @@ public class HospitalManagementFacade {
                     .eq("hospital_id", hospital.getId())
                     .eq("is_deleted", IsDeleteEnum.N.getKey())).stream().forEach(region -> {
                 DownBoxRegionDTO downBoxRegionDTO = new DownBoxRegionDTO();
-                BeanUtils.copyProperties(region, downBoxRegionDTO);
+                downBoxRegionDTO.setVal(region.getName());
+                downBoxRegionDTO.setName(region.getId());
                 downBoxRegions.add(downBoxRegionDTO);
             });
             outMap.put(DictionaryEnum.REGION.getKey() + "", downBoxRegions);

security-center/src/main/java/com/lantone/security/facade/UserManagementFacade.java

@@ -203,8 +203,7 @@ public class UserManagementFacade {
         //添加时判断
         if (user.getId() == null) {
             if (userFacade.list(new QueryWrapper<User>()
-                    .eq("username", user.getUsername())
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())).size() > 0) {
+                    .eq("username", user.getUsername())).size() > 0) {
                 Asserts.fail("该用户已存在,请更换用户名");
             }
             //修改时判断