Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r35705 -r35718
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 35705)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 35718)
@@ -1012,7 +1012,7 @@
 							+ " or dg.departCodes like '%;" + application.getDepartCoding() + "'"
 							+ " or dg.departCodes like '%;" + application.getDepartCoding() + ";%'"
 							+ " or dg.departCodes like '" + application.getDepartCoding() + "') and dg.warningWays is not null ";
-			String sql = String.format("select u.id userId, u.fullName, dg.warningWays "
+			String sql = String.format("select u.id userId, u.name, dg.warningWays "
 					+ "from %s dg "
 					+ "join %s dgu on dg.id = dgu.departmentGroupId "
 					+ "join SS_USERS u on dgu.userId = u.id where 1=1 %s order by u.id ",
@@ -1025,12 +1025,12 @@
 				rs = objectDao.executeSql(sql);
 				while(rs.next()){
 					Long userId = rs.getLong("userId");
-					String fullName = rs.getString("fullName");
+					String name = rs.getString("name");
 					String warningWays = rs.getString("warningWays");
-					if(!DatabaseUtil.isPoIdValid(userId) || StringUtils.isBlank(fullName) || StringUtils.isBlank(warningWays)){
+					if(!DatabaseUtil.isPoIdValid(userId) || StringUtils.isBlank(name) || StringUtils.isBlank(warningWays)){
 						continue;
 					}
-					userFullNameMap.put(userId, fullName);
+					userFullNameMap.put(userId, name);
 					String[] warningWayArr = StringTools.split(warningWays, ';');
 					if(warningWayArr != null && warningWayArr.length > 0){
 						for (String warningWay : warningWayArr) {