更新全局设置字段，组织管理

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/dao/mapper/OrganizationMapper.java

@@ -30,6 +30,6 @@ public interface OrganizationMapper extends BaseMapper<Project> {
     @Select("select id,project_name projectName,num from project where mt_company_id = ${mtCompanyId} and district=#{district}")
     List<HashMap<String, String>> projects(@Param("mtCompanyId") Long mtCompanyId, @Param("district") String district);
 
-    @Select("select u.avatar_url avatar,u.name name, p.user_role role,u.mobile mobile,p.is_monitor monitor from project_user p left join user_info u on p.user_id = u.user_id where p.project_id = #{projectId}")
+    @Select("select u.avatar_url avatar,u.name name, p.user_role role,u.mobile mobile,p.is_monitor monitor from project_user p left join user_info u on p.user_id = u.user_id where p.project_id = #{projectId} and (p.user_role in (13, 14, 15, 16) or p.is_monitor = 1)")
     List<HashMap<String, Object>> users(@Param("projectId") Long projectId);
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/service/OrganizationService.java

@@ -60,13 +60,9 @@ public class OrganizationService {
         if (projectUsers.isEmpty()) {
             return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
         }
-
         for (HashMap<String, Object> projectUser : projectUsers) {
             Object monitor = projectUser.get("monitor");
             Object role = projectUser.get("role");
-            if (!(monitor.equals("1") | role.equals("13") | role.equals("14") | role.equals("15") | role.equals("16"))) {
-                deleteList.add(projectUser);
-            }
             if (monitor != null && monitor.equals("1")) {
                 projectUser.replace("monitor", "维保班长");
             }

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/GlobalSet.java

@@ -43,6 +43,12 @@ public class GlobalSet implements Serializable {
     @TableField("value")
     private String value;
 
+    /**
+     * 设置编码号
+     */
+    @TableField("code")
+    private String code;
+
     /**
      * 描述
      */