用户接口调整--存在相同姓名和手机号的用户 新增的时候仍然更新

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxApiServiceImpl.java

@@ -504,10 +504,24 @@ public class ZhcxApiServiceImpl implements ZhcxApiService {
             }
             if ("user".equals(dataType)) {
                 if ("add".equals(operationType)) {
-                    sysUserDo.setId(SecurityUtil.getUUID());
-                    sysUserDo.setPassword(
-                            SecurityUtil.getSaltMd5AndSha("Zpmc@0415",sysUserDo.getId()));
-                    sysUserService.save(sysUserDo);
+                    //例外情况 如果存在相同用户和手机 则更新
+                    SysUserDo user = null;
+                    try {
+                        LambdaQueryWrapper<SysUserDo> queryWrapper = Wrappers.lambdaQuery();
+                        queryWrapper.eq(SysUserDo::getMobile, sysUserDo.getMobile()).eq(SysUserDo::getName, sysUserDo.getName());
+                        user = sysUserService.getOne(queryWrapper);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    if(user != null){
+                        sysUserDo.setId(user.getId());
+                        sysUserService.updateById(sysUserDo);
+                    }else{
+                        sysUserDo.setId(SecurityUtil.getUUID());
+                        sysUserDo.setPassword(
+                                SecurityUtil.getSaltMd5AndSha("Zpmc@0415",sysUserDo.getId()));
+                        sysUserService.save(sysUserDo);
+                    }
                 }else{
                     UpdateWrapper<SysUserDo> updateWrapper = new UpdateWrapper<>();
                     updateWrapper.eq("CODE", sysUserDo.getCode());