机构-bug修改 （本地已测试）

pom.xml

@@ -49,9 +49,9 @@
                 <profiles.active>dev</profiles.active>
                 <nacos.server>121.36.73.159:8848</nacos.server>
                 <nacos.discovery.group>MZ</nacos.discovery.group>
-                <nacos.discovery.namespace>lzm</nacos.discovery.namespace>
+                <nacos.discovery.namespace>ch</nacos.discovery.namespace>
                 <nacos.config.group>MZ</nacos.config.group>
-                <nacos.config.namespace>lzm</nacos.config.namespace>
+                <nacos.config.namespace>ch</nacos.config.namespace>
             </properties>
             <activation>
                 <!-- 默认环境 -->
@@ -62,7 +62,7 @@
             <id>prod</id>
             <properties>
                 <profiles.active>prod</profiles.active>
-                <nacos.server>192.168.0.252:8848</nacos.server>
+                <nacos.server>121.36.73.159:8848</nacos.server>
                 <nacos.discovery.group>MZ</nacos.discovery.group>
                 <nacos.config.group>MZ</nacos.config.group>
                 <nacos.discovery.namespace>dev</nacos.discovery.namespace>
@@ -185,9 +185,9 @@
             </dependency>
 
             <!-- Collection 增强Java集合框架 -->
-            <dependency> 
-                <groupId>commons-collections</groupId> 
-                <artifactId>commons-collections</artifactId> 
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
                 <version>${commons-collections.version}</version>
             </dependency>
 
@@ -304,4 +304,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/domain/YljgFwcdCw.java

@@ -1,6 +1,7 @@
 package com.ruoyi.organization.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
@@ -89,13 +90,19 @@ public class YljgFwcdCw extends BaseEntity
     @DictV(type = "CZ035",message = "{床位状态}")
     private String cwzt;
 
-
+    @TableField(exist = false)
     private String fjName;
 
+    @TableField(exist = false)
     private String lcId;
+
+    @TableField(exist = false)
     private String lcName;
 
+    @TableField(exist = false)
     private String lyId;
+
+    @TableField(exist = false)
     private String lyName;
 
 }

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/domain/YljgFwcdFj.java

@@ -1,6 +1,7 @@
 package com.ruoyi.organization.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
@@ -86,8 +87,13 @@ public class YljgFwcdFj extends BaseEntity
     @DictV(type = "CZ035",message = "{是否住满}")
     private String sfzm;
 
+    @TableField(exist = false)
     private String lyId;
+
+    @TableField(exist = false)
     private String lyName;
+
+    @TableField(exist = false)
     private String lcName;
 
 }

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/domain/YljgFwcdLc.java

@@ -1,6 +1,7 @@
 package com.ruoyi.organization.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
@@ -67,8 +68,8 @@ public class YljgFwcdLc extends BaseEntity
     @DictV(type = "CZ035",message = "{楼层状态}")
     private String lczt;
 
-
     /** 楼宇名称 */
+    @TableField(exist = false)
     private String lyName;
 
 }

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/domain/YljgYgJbxx.java

@@ -1,6 +1,7 @@
 package com.ruoyi.organization.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
@@ -164,6 +165,7 @@ public class YljgYgJbxx extends BaseEntity
     private String lzsj;
 
     /** 部门名称 */
+    @TableField(exist = false)
     private String zzmc;
 
 }

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/service/impl/YljgBmxxServiceImpl.java

@@ -143,7 +143,7 @@ public class YljgBmxxServiceImpl implements IYljgBmxxService
             }
             LambdaQueryWrapper<YljgBmxx> lqw = new LambdaQueryWrapper<>();
             lqw.eq(YljgBmxx::getZzmc, originBm.getZzmc())
-            .ne(ObjectUtil.isNotNull(yljgBmxx.getJgId()), YljgBmxx::getJgId, yljgBmxx.getJgId());
+            .ne(ObjectUtil.isNotNull(yljgBmxx.getJgId()), YljgBmxx::getJgId, originBm.getJgId());
             Long count = yljgBmxxMapper.selectCount(lqw);
             if (count > 0){
                 throw new ServiceException("该部门名称已存在,请勿录入重复信息！");

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/service/impl/YljgFwcdCwServiceImpl.java

@@ -1,5 +1,7 @@
 package com.ruoyi.organization.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.exception.ServiceException;
@@ -128,11 +130,18 @@ public class YljgFwcdCwServiceImpl implements IYljgFwcdCwService
     }
 
     public void checkExist(YljgFwcdCw yljgFwcdCw){
+        YljgFwcdCw originCw;
+        if (StringUtils.isBlank(yljgFwcdCw.getId())){
+            originCw = yljgFwcdCw;
+        }else{
+            originCw = yljgFwcdCwMapper.selectById(yljgFwcdCw.getId());
+            BeanUtil.copyProperties(yljgFwcdCw,originCw,new CopyOptions().ignoreNullValue());
+        }
         LambdaQueryWrapper<YljgFwcdCw> lqw = new LambdaQueryWrapper<YljgFwcdCw>()
-                .eq(YljgFwcdCw::getFjId, yljgFwcdCw.getFjId())
-                .eq(YljgFwcdCw::getCwh, yljgFwcdCw.getCwh())
-                .eq(YljgFwcdCw::getCwzt, yljgFwcdCw.getCwzt())
-                .ne(YljgFwcdCw::getId, yljgFwcdCw.getId());
+                .eq(YljgFwcdCw::getFjId, originCw.getFjId())
+                .eq(YljgFwcdCw::getCwh, originCw.getCwh())
+                .eq(YljgFwcdCw::getCwzt, originCw.getCwzt())
+                .ne(ObjectUtil.isNotNull(originCw.getId()), YljgFwcdCw::getId, originCw.getId());
         Long count = yljgFwcdCwMapper.selectCount(lqw);
         if (count > 0){
             throw new ServiceException("该房间的床位号已存在,请勿录入重复信息！");

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/service/impl/YljgFwcdFjServiceImpl.java

@@ -1,5 +1,7 @@
 package com.ruoyi.organization.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.exception.ServiceException;
@@ -144,16 +146,23 @@ public class YljgFwcdFjServiceImpl implements IYljgFwcdFjService
 
     @Override
     public void checkExist(YljgFwcdFj yljgFwcdFj) {
+        YljgFwcdFj originFj;
+        if (StringUtils.isBlank(yljgFwcdFj.getId())){
+            originFj = yljgFwcdFj;
+        }else{
+            originFj = yljgFwcdFjMapper.selectById(yljgFwcdFj.getId());
+            BeanUtil.copyProperties(yljgFwcdFj,originFj,new CopyOptions().ignoreNullValue());
+        }
         LambdaQueryWrapper<YljgFwcdFj> lqw = new LambdaQueryWrapper<YljgFwcdFj>()
-                .eq(ObjectUtil.isNotNull(yljgFwcdFj.getLcId()), YljgFwcdFj::getLcId, yljgFwcdFj.getLcId())
+                .eq(YljgFwcdFj::getLcId, originFj.getLcId())
                 .and(wrapper-> wrapper
-                        .eq(YljgFwcdFj::getFjmc, yljgFwcdFj.getFjmc())
-                        .eq(YljgFwcdFj::getSfzm, yljgFwcdFj.getSfzm())
+                        .eq(YljgFwcdFj::getFjmc, originFj.getFjmc())
+                        .eq(YljgFwcdFj::getSfzm, originFj.getSfzm())
                         .or()
-                        .eq(YljgFwcdFj::getFjbh, yljgFwcdFj.getFjbh())
-                        .eq(YljgFwcdFj::getSfzm, yljgFwcdFj.getSfzm())
+                        .eq(YljgFwcdFj::getFjbh, originFj.getFjbh())
+                        .eq(YljgFwcdFj::getSfzm, originFj.getSfzm())
                 )
-                .ne(ObjectUtil.isNotNull(yljgFwcdFj.getId()), YljgFwcdFj::getId, yljgFwcdFj.getId());
+                .ne(ObjectUtil.isNotNull(originFj.getId()), YljgFwcdFj::getId, originFj.getId());
         Long count = yljgFwcdFjMapper.selectCount(lqw);
         if (count > 0){
             throw new ServiceException("该楼层下的房间名称/编号已存在,请勿录入重复信息！");

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/service/impl/YljgFwcdLcServiceImpl.java

@@ -1,5 +1,7 @@
 package com.ruoyi.organization.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.exception.ServiceException;
@@ -10,6 +12,7 @@ import com.ruoyi.ext.api.enums.RoomManagementStatus;
 import com.ruoyi.organization.domain.YljgFwcdFj;
 import com.ruoyi.organization.domain.YljgFwcdLc;
 import com.ruoyi.organization.domain.YljgFwcdLy;
+import com.ruoyi.organization.domain.YljgHd;
 import com.ruoyi.organization.mapper.YljgFwcdFjMapper;
 import com.ruoyi.organization.mapper.YljgFwcdLcMapper;
 import com.ruoyi.organization.mapper.YljgFwcdLyMapper;
@@ -145,16 +148,23 @@ public class YljgFwcdLcServiceImpl implements IYljgFwcdLcService
 
     @Override
     public void checkExist(YljgFwcdLc yljgFwcdLc) {
+        YljgFwcdLc originLc;
+        if (StringUtils.isBlank(yljgFwcdLc.getId())){
+            originLc = yljgFwcdLc;
+        }else{
+            originLc = yljgFwcdLcMapper.selectById(yljgFwcdLc.getId());
+            BeanUtil.copyProperties(yljgFwcdLc,originLc,new CopyOptions().ignoreNullValue());
+        }
         LambdaQueryWrapper<YljgFwcdLc> lqw = new LambdaQueryWrapper<YljgFwcdLc>()
-                .eq(YljgFwcdLc::getLyId, yljgFwcdLc.getLyId())
+                .eq(YljgFwcdLc::getLyId, originLc.getLyId())
                 .and(wrapper -> wrapper
-                        .eq(YljgFwcdLc::getLcmc, yljgFwcdLc.getLcmc())
-                        .eq(YljgFwcdLc::getLczt, yljgFwcdLc.getLczt())
+                        .eq(YljgFwcdLc::getLcmc, originLc.getLcmc())
+                        .eq(YljgFwcdLc::getLczt, originLc.getLczt())
                         .or()
-                        .eq(YljgFwcdLc::getLcbh, yljgFwcdLc.getLcbh())
-                        .eq(YljgFwcdLc::getLczt, yljgFwcdLc.getLczt())
+                        .eq(YljgFwcdLc::getLcbh, originLc.getLcbh())
+                        .eq(YljgFwcdLc::getLczt, originLc.getLczt())
                 )
-                .ne(ObjectUtil.isNotNull(yljgFwcdLc.getId()), YljgFwcdLc::getId, yljgFwcdLc.getId());
+                .ne(ObjectUtil.isNotNull(originLc.getId()), YljgFwcdLc::getId, originLc.getId());
         Long count = yljgFwcdLcMapper.selectCount(lqw);
         if (count > 0){
             throw new ServiceException("该楼宇下的楼层名称/编号已存在,请勿录入重复信息！");

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/service/impl/YljgFwcdLyServiceImpl.java

@@ -153,10 +153,10 @@ public class YljgFwcdLyServiceImpl implements IYljgFwcdLyService
         }
         LambdaQueryWrapper<YljgFwcdLy> lqw = new LambdaQueryWrapper<YljgFwcdLy>()
                 .and(wrapper -> wrapper
-                        .eq(YljgFwcdLy::getLymc, yljgFwcdLy.getLymc())
-                        .eq(YljgFwcdLy::getLyzt, yljgFwcdLy.getLyzt())
+                        .eq(YljgFwcdLy::getLymc, originLy.getLymc())
+                        .eq(YljgFwcdLy::getLyzt, originLy.getLyzt())
                 )
-                .ne(ObjectUtil.isNotNull(yljgFwcdLy.getId()), YljgFwcdLy::getId, yljgFwcdLy.getId());
+                .ne(ObjectUtil.isNotNull(originLy.getId()), YljgFwcdLy::getId, originLy.getId());
         Long count = yljgFwcdLyMapper.selectCount(lqw);
         if (count > 0){
             throw new ServiceException("该楼宇名称已存在,请勿录入重复信息！");

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/service/impl/YljgYgJbxxServiceImpl.java

@@ -2,12 +2,15 @@ package com.ruoyi.organization.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.ext.api.enums.DocumentTypeStatus;
 import com.ruoyi.ext.api.utils.IDCardUtil;
+import com.ruoyi.organization.domain.YljgFwcdLc;
 import com.ruoyi.organization.domain.YljgYgJbxx;
 import com.ruoyi.organization.mapper.YljgYgJbxxMapper;
 import com.ruoyi.organization.service.IYljgYgJbxxService;
@@ -153,44 +156,20 @@ public class YljgYgJbxxServiceImpl implements IYljgYgJbxxService
 
     @Override
     public void checkIsRepeat(YljgYgJbxx yljgYgJbxx,Integer type){
-//        YljgYgJbxx originYg;
-//        if (StringUtils.isBlank(yljgYgJbxx.getId())){
-//            if(StringUtils.isBlank(yljgYgJbxx.getSfzlx())){
-//                throw new ServiceException("新增时，身份证类型必须有值.");
-//            }
-//        }else{
-//            originYg = yljgYgJbxxMapper.selectYljgYgJbxxById(yljgYgJbxx.getId());
-//            if(StringUtils.isBlank(yljgYgJbxx.getSfzlx())){
-//                yljgYgJbxx.setSfzlx(originYg.getSfzlx());
-//            }
-//        }
-        String lx = yljgYgJbxx.getSfzlx();
-        String idCard = yljgYgJbxx.getSfzhm();
-        String jgId = SecurityUtils.getJgId();
-        YljgYgJbxx y = new YljgYgJbxx();
-        y.setSfzlx(lx);
-        y.setSfzhm(idCard);
-        y.setJgId(SecurityUtils.getJgId());
-        List<String> list1 = new ArrayList<>();
-        list1.add(jgId);
-        list1.add(lx);
-        list1.add(idCard);
-        Integer resultSize = yljgYgJbxxMapper.selectYljgYgJbxxList(y).size();
-        if( type == 1 ){ // 新增
-            if(resultSize!=0){
-                throw new ServiceException("该身份证号码已存在,请勿录入重复信息！");
-            }
-        } else{ // 修改
-            YljgYgJbxx jbxx1 = yljgYgJbxxMapper.selectYljgYgJbxxById(yljgYgJbxx.getId());
-            List<String> list2 = new ArrayList<>();
-            list2.add(jgId);
-            list2.add(jbxx1.getSfzlx());
-            list2.add(jbxx1.getSfzhm());
-            if(!list1.containsAll(list2)){ // 要修改的身份证号与传值身份证号不相等
-                if(resultSize>1){
-                    throw new ServiceException("该身份证号码已存在,修改失败！");
-                }
-            }
+        YljgYgJbxx originYg;
+        if (StringUtils.isBlank(yljgYgJbxx.getId())){
+            originYg = yljgYgJbxx;
+        }else{
+            originYg = yljgYgJbxxMapper.selectById(yljgYgJbxx.getId());
+            BeanUtil.copyProperties(yljgYgJbxx,originYg,new CopyOptions().ignoreNullValue());
+        }
+        LambdaQueryWrapper<YljgYgJbxx> lqw = new LambdaQueryWrapper<YljgYgJbxx>()
+                .eq(YljgYgJbxx::getSfzlx, originYg.getSfzlx())
+                .eq(YljgYgJbxx::getSfzhm, originYg.getSfzhm())
+                .ne(ObjectUtil.isNotNull(originYg.getId()), YljgYgJbxx::getId, originYg.getId());
+        Long count = yljgYgJbxxMapper.selectCount(lqw);
+        if (count > 0){
+            throw new ServiceException("该证件类型的证件号码已存在,请勿录入重复信息！");
         }
     }
     /**