Merge branch 'xmm' into 'master'

Xmm

See merge request !5

hmit-api/src/main/java/io/hmit/modules/fhjw/service/impl/FhjwCaseServiceImpl.java

@@ -75,7 +75,7 @@ public class FhjwCaseServiceImpl extends CrudServiceImpl<FhjwCaseDao, FhjwCaseEn
             if("嫌疑人".equals(item.getUserRole()) || "被害人".equals(item.getUserRole())){
                 dto.setPeopleName(item.getUserName());
             }
-            if("代理人".equals(item.getUserRole()) && !"".equals(item.getUserName())){
+            if("代理人".equals(item.getUserRole()) && StringUtils.isNotBlank(item.getUserName())){
                 dto.setAgentName(item.getUserName());
             }
         });
@@ -109,7 +109,7 @@ public class FhjwCaseServiceImpl extends CrudServiceImpl<FhjwCaseDao, FhjwCaseEn
         if(dto.getPeopleInfo()!=null && dto.getPeopleInfo().size()>0){
             dto.getPeopleInfo().stream().forEach(item ->{
                 UserEntity userEntity = null;
-                if(!"".equals(item.getUserMobile()) ){
+                if(StringUtils.isNotBlank(item.getUserMobile()) ){
                     userEntity = userService.getByMobile(item.getUserMobile());
                 }
 
@@ -118,7 +118,7 @@ public class FhjwCaseServiceImpl extends CrudServiceImpl<FhjwCaseDao, FhjwCaseEn
 
                 if("嫌疑人".equals(item.getUserRole()) || "被害人".equals(item.getUserRole())){
                     actRoleName = "当事人";
-                    if(!"".equals(item.getUserName()) ){
+                    if(StringUtils.isNotBlank(item.getUserName()) ){
                         Map<String, Object> query = new HashMap<>();
                         query.put("username",item.getUserName());
                         userEntity = userService.getByParams(query);
@@ -127,13 +127,13 @@ public class FhjwCaseServiceImpl extends CrudServiceImpl<FhjwCaseDao, FhjwCaseEn
 
                 //案件相关人员不存在人员表中则插入
                 if(userEntity==null){
-                    if("".equals(item.getUserName())){
+                    if(StringUtils.isBlank(item.getUserName())){
                        return;
                     }
                     //tb_user中添加人员
                     UserEntity user = new UserEntity();
                     user.setUsername(item.getUserName());
-                    user.setMobile("".equals(item.getUserMobile())?"":item.getUserMobile());
+                    user.setMobile(StringUtils.isBlank(item.getUserMobile())?"":item.getUserMobile());
                     user.setCreateDate(new Date());
                     user.setUserIdno(item.getUserIdNo());
                     user.setIdentity(item.getUserRole());
@@ -156,9 +156,9 @@ public class FhjwCaseServiceImpl extends CrudServiceImpl<FhjwCaseDao, FhjwCaseEn
                     Long userId = userEntity.getId();
 
                     //人员信息更新
-                    userEntity.setMobile("".equals(item.getUserMobile())?userEntity.getMobile():item.getUserMobile());
+                    userEntity.setMobile(StringUtils.isBlank(item.getUserMobile())?userEntity.getMobile():item.getUserMobile());
                     userEntity.setUsername(item.getUserName());
-                    userEntity.setUserIdno("".equals(item.getUserIdNo())?userEntity.getUserIdno():item.getUserIdNo());
+                    userEntity.setUserIdno(StringUtils.isBlank(item.getUserIdNo())?userEntity.getUserIdno():item.getUserIdNo());
                     userEntity.setIdentity(item.getUserRole());
                     userService.updateById(userEntity);
 
@@ -204,7 +204,9 @@ public class FhjwCaseServiceImpl extends CrudServiceImpl<FhjwCaseDao, FhjwCaseEn
      */
     public boolean undertakerInfoNotNull(Map<String, Object> params){
 
-        if(params.get("undertaker")!=null && params.get("undertakerMobile")!=null && !"".equals(params.get("undertaker")) && !"".equals(params.get("undertakerMobile"))){
+        if(params.get("undertaker")!=null && params.get("undertakerMobile")!=null
+                && StringUtils.isNotBlank(params.get("undertaker").toString())
+                && StringUtils.isNotBlank(params.get("undertakerMobile").toString())){
             return true;
         }
         return false;