修改nfc

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysAreaCheckServiceImpl.java

@@ -46,6 +46,7 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
     private SysDictDataMapper sysDictDataMapper;
     @Autowired
     private SysOrgMapper sysOrgMapper;
+
     @Override
     public TableDataInfo<SysAreaCheck> selectPage(SysAreaCheckDTO sysAreaCheck) {
         //未删除
@@ -71,7 +72,7 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
     @Override
     public List<SysAreaCheck> selectByAreaId(Long areaId) {
         SysAreaCheck areaCheck = new SysAreaCheck();
-      //  areaCheck.setAreaId(areaId);
+        //  areaCheck.setAreaId(areaId);
         areaCheck.setDelFlag("0");
         //查询机构名称
         return baseMapper.selectSysAreaCheckList(areaCheck);
@@ -129,8 +130,8 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
         if (aLong > 0) {
             throw new ServiceException("名称不能重复");
         }
-      //  SysOrg sysOrg = orgService.selectSysOrgById(sysAreaCheck.getOrgId());
-      //  sysAreaCheck.setOrgPath(sysOrg.getPath());
+        //  SysOrg sysOrg = orgService.selectSysOrgById(sysAreaCheck.getOrgId());
+        //  sysAreaCheck.setOrgPath(sysOrg.getPath());
         sysAreaCheck.setCreateTime(DateUtils.getNowDate());
         sysAreaCheck.setCreateBy(SecurityUtils.getUsername());
         sysAreaCheck.setUpdateBy(SecurityUtils.getUsername());
@@ -149,15 +150,14 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
     public int updateSysAreaCheck(SysAreaCheck sysAreaCheck) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("check_name", sysAreaCheck.getCheckName());
-      //  queryWrapper.eq("area_id", sysAreaCheck.getAreaId());
-        queryWrapper.eq("org_id", sysAreaCheck.getOrgId());
+        queryWrapper.eq("org_type", sysAreaCheck.getOrgType());
         queryWrapper.eq("del_flag", 0);
         SysAreaCheck sysAreaCheck1 = baseMapper.selectOne(queryWrapper);
-        if (null != sysAreaCheck1 && sysAreaCheck1.getId() != sysAreaCheck.getId()) {
+        if (null != sysAreaCheck1 && !sysAreaCheck1.getId().equals(sysAreaCheck.getId())) {
             throw new ServiceException("名称不能重复");
         }
-        SysOrg sysOrg = orgService.selectSysOrgById(sysAreaCheck.getOrgId());
-        sysAreaCheck.setOrgPath(sysOrg.getPath());
+        //  SysOrg sysOrg = orgService.selectSysOrgById(sysAreaCheck.getOrgId());
+        //    sysAreaCheck.setOrgPath(sysOrg.getPath());
         sysAreaCheck.setUpdateBy(SecurityUtils.getUsername());
         sysAreaCheck.setUpdateTime(DateUtils.getNowDate());
         sysAreaCheck.setUpdateId(SecurityUtils.getUserId().toString());