Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.34_20230426_v4_1_6p_release.apk =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.34_20230420_v4_1_nologo_release.apk =================================================================== diff -u -r35664 -r35735 Binary files differ Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.34_20230426_v4_1_release.apk =================================================================== diff -u Binary files differ Index: forgon-core/src/main/java/com/forgon/java_websocket/service/PushRecordManagerImpl.java =================================================================== diff -u -r35729 -r35735 --- forgon-core/src/main/java/com/forgon/java_websocket/service/PushRecordManagerImpl.java (.../PushRecordManagerImpl.java) (revision 35729) +++ forgon-core/src/main/java/com/forgon/java_websocket/service/PushRecordManagerImpl.java (.../PushRecordManagerImpl.java) (revision 35735) @@ -40,20 +40,16 @@ if(CollectionUtils.isNotEmpty(userNameList)){ for(String userName : userNameList){ super.save(new PushRecord(entityName, entityId, userName)); - List noticeTypeList = userNameToNoticeTypeListMap.get(userName); - if(CollectionUtils.isNotEmpty(noticeTypeList)){ - if(javaWebSocketServer != null){ - JSONObject contentJson = new JSONObject(); - contentJson.put("entityName", entityName); - contentJson.put("message", remindMessage); - contentJson.put("noticeTypeList", JSONArray.fromObject(noticeTypeList)); - contentJson.put("userNameList", JSONArray.fromObject(userNameList)); - javaWebSocketServer.sendMessage(contentJson, userNameList); - } - } } + if(javaWebSocketServer != null){ + JSONObject contentJson = new JSONObject(); + contentJson.put("entityName", entityName); + contentJson.put("message", remindMessage); + contentJson.put("userNameList", JSONArray.fromObject(userNameList)); + contentJson.put("userNameToNoticeTypeListMap", JSONObject.fromObject(userNameToNoticeTypeListMap)); + javaWebSocketServer.sendMessage(contentJson, userNameList); + } } - } } Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.34_20230420_v4_1_6p_release.apk =================================================================== diff -u -r35664 -r35735 Binary files differ Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.34_20230420_v4_1_release.apk =================================================================== diff -u -r35664 -r35735 Binary files differ Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r35668 -r35735 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 35668) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 35735) @@ -587,6 +587,7 @@ .key("currentOrgUnitCode").value(currentOrgUnitCode) .key("isEnableTousseOpSign").value(Boolean.valueOf(supplyRoomConfig.getIsEnableTousseOpSign())) .key("isEnableTousseOpRecipient").value(Boolean.valueOf(supplyRoomConfig.getIsEnableTousseOpRecipient())) + .key("loginUserDefaultOpRecipient").value(Boolean.valueOf(supplyRoomConfig.getLoginUserDefaultOpRecipient())) .key("isEnableTousseOpDestLocation").value(Boolean.valueOf(supplyRoomConfig.getIsEnableTousseOpDestLocation())) .key("handWrittenSignatureMode").value(supplyRoomConfig.getHandWrittenSignatureMode()) .key("modules").value(modelJSONArray) Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.34_20230426_v4_1_nologo_release.apk =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json =================================================================== diff -u -r35664 -r35735 --- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json (.../clientForAndroid.json) (revision 35664) +++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json (.../clientForAndroid.json) (revision 35735) @@ -1,7 +1,7 @@ { "success":"true", "version":"4.7.34", - "urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.34_20230420_v4_1_release.apk", - "urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_VV4.7.34_20230420_v4_1_nologo_release.apk", - "urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.34_20230420_v4_1_6p_release.apk", + "urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.34_20230426_v4_1_release.apk", + "urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_VV4.7.34_20230426_v4_1_nologo_release.apk", + "urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.34_20230426_v4_1_6p_release.apk", } \ No newline at end of file