avenue-upms/avenue-upms-biz/src/main/java/com/emergency/avenue/admin/service/impl/SysUserServiceImpl.java

@@ -149,6 +149,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		userInfo.setDeptType(sysDept.getDeptType());
 		userInfo.setDeptName(sysDept.getName());
 		userInfo.setPermissions(ArrayUtil.toArray(permissions, String.class));
+		userInfo.setAbbreviationName(sysDept.getAbbreviationName());
 		return userInfo;
 	}
 

avenue-upms/avenue-upms-biz/src/main/java/com/emergency/avenue/storage/controller/OutboundInfoController.java

@@ -56,7 +56,7 @@ public class OutboundInfoController {
 			String deptType = SecurityUtils.getUser().getDeptType();
 			if (deptType.equals("2")) {
 				query.lambda().ne(OutboundInfo::getStatus,"1");
-				query.orderByAsc("FIELD(status,'2','6','3','4','5')");
+				query.orderByAsc("FIELD(status,'2','6','3','4','5','7')");
 			}else if (deptType.equals("1")){
 				query.lambda().notIn(OutboundInfo::getStatus, Arrays.asList("1","2","4","7"));
 				query.lambda().orderByAsc(OutboundInfo::getStatus);