Merge branch 'master' of http://git.cc-lotus.info/sckj/mz-cloud

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglXmglServiceImpl.java

@@ -44,9 +44,9 @@ public class ZwywBtglXmglServiceImpl implements IZwywBtglXmglService
         if (ObjectUtils.isNotEmpty(zwywBtglXmgl)){
             zwywBtglXmgl.setYyfw(sysDeptJlMapper.getXzqhCodes(zwywBtglXmgl.getYyfw()));
             if (StringUtils.equals(zwywBtglXmgl.getYydx(), "01")) {
-                zwywBtglXmgl.setGnjb(zwywBtglXmglMapper.selectGnjb("4"));
+//                zwywBtglXmgl.setGnjb(zwywBtglXmglMapper.selectGnjb("4"));
             } else {
-                zwywBtglXmgl.setGnjb(zwywBtglXmglMapper.selectGnjb("3"));
+//                zwywBtglXmgl.setGnjb(zwywBtglXmglMapper.selectGnjb("3"));
             }
         }
         return zwywBtglXmgl;

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/DjpdSqController.java

@@ -376,7 +376,6 @@ public class DjpdSqController extends BaseController
         if (CollectionUtils.isNotEmpty(pageIdList)) {
             list = htxxMapper.selectBusinessYljgKhHtxxByQy(pageIdList);
         }
-        String key= SecurityUtils.getEncryptKey();
         list.forEach(l -> {
             if (l.getJgmc().contains("%%")) {
                 String jgmc = l.getJgmc().substring(0, l.getJgmc().indexOf("%%"));
@@ -391,8 +390,6 @@ public class DjpdSqController extends BaseController
                     }
                 }
             }
-            l.setZjhm( SecurityUtils.encryptData(key,l.getZjhm()));
-            l.setXm( SecurityUtils.encryptData(key,l.getXm()));
         });
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/YljgKhJbxxController.java

@@ -147,7 +147,6 @@ public class YljgKhJbxxController extends BaseController
         if (CollectionUtils.isNotEmpty(pageIdList)) {
             list = htxxMapper.selectBusinessYljgKhHtxxByQy(pageIdList);
         }
-        String key= SecurityUtils.getEncryptKey();
         list.forEach(l -> {
             if (l.getJgmc().contains("%%")) {
                 String jgmc = l.getJgmc().substring(0, l.getJgmc().indexOf("%%"));
@@ -162,8 +161,6 @@ public class YljgKhJbxxController extends BaseController
                     }
                 }
             }
-            l.setZjhm( SecurityUtils.encryptData(key,l.getZjhm()));
-            l.setXm( SecurityUtils.encryptData(key,l.getXm()));
         });
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);

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

@@ -87,8 +87,6 @@ public class YljgKhHfdjServiceImpl implements IYljgKhHfdjService
         yljgKhHfdj.setJgId(SecurityUtils.getJgId());
         yljgKhHfdj.setBlr(SecurityUtils.getUsername());
         YljgKhHtxx htxx = yljgKhHtxxMapper.selectYljgKhHtxxById(yljgKhHfdj.getHtId());
-        htxx.setXm(SecurityUtils.sm4decrypt_ECB(SecurityUtils.getEncryptKey(), htxx.getXm()));
-        htxx.setZjhm(SecurityUtils.sm4decrypt_ECB(SecurityUtils.getEncryptKey(), htxx.getZjhm()));
         if (ObjectUtils.isNotEmpty(htxx)) {
             // 旧床位
             YljgFwcdCw oldCw = yljgFwcdCwMapper.selectYljgFwcdCwById(htxx.getCwId());