Index: ssts-web/src/main/resources/spring/projects/zsykzx/timer.xml =================================================================== diff -u -r27018 -r27696 --- ssts-web/src/main/resources/spring/projects/zsykzx/timer.xml (.../timer.xml) (revision 27018) +++ ssts-web/src/main/resources/spring/projects/zsykzx/timer.xml (.../timer.xml) (revision 27696) @@ -179,7 +179,7 @@ - + Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/zsykzx/WebsphereMqDaoImpl.java =================================================================== diff -u -r26762 -r27696 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/zsykzx/WebsphereMqDaoImpl.java (.../WebsphereMqDaoImpl.java) (revision 26762) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/zsykzx/WebsphereMqDaoImpl.java (.../WebsphereMqDaoImpl.java) (revision 27696) @@ -217,7 +217,7 @@ //设置类型为一次性物品(先注释、因为同步进来的物资有可能是一次性物品或器械) //inventory.setTypeGoods(DisposableGoods.TYPE_NAME); dataList.add(inventory); - }/*else if(StringUtils.equals(DATA_TYPE_ORGUNIT, msgId)){ + }else if(StringUtils.equals(DATA_TYPE_ORGUNIT, msgId)){ Object nameObject = dataObject.opt("name"); Object codeObject = dataObject.opt("code"); Object upIdObject = dataObject.opt("UpId"); @@ -235,7 +235,11 @@ userVo.setCoding((logOnNameObject != null && logOnNameObject instanceof String) ? (String)logOnNameObject : null); userVo.setOrgUnitCoding((departMentIdObject != null && departMentIdObject instanceof String) ? (String)departMentIdObject : null); dataList.add(userVo); - }*///和信息科冯工沟通过,科室与人员暂不同步 + } + /* + * 1.2019年时,应该信息科冯工要求屏蔽科室人员同步,科室与人员暂不同步. + * 2.2020年3月又重新开启(ZSYKZX-121 科室人员同步功能放开,目前版本是屏蔽未放开的) + */ } } }