1，新增查詢城市的員工

2，權限選擇改爲單選

house365-hgs-web/src/main/webapp/WEB-INF/views/user/pages/authorize.jsp

@@ -87,21 +87,27 @@
 
     //单选
     function checkMember(btn) {
-        if (btn.checked) {
-            var checkAll = true;
+        if(btn.checked) {
             for (i = 0; i < document.all("memberCheck").length; i++) {
-                if (document.all("memberCheck")[i].checked == false) {
-                    checkAll = false;
-                }
-            }
-
-            if (checkAll) {
-                document.getElementById("memberCheckAll").checked = true;
+                document.all("memberCheck")[i].checked = false;
             }
+            btn.checked = true;
         }
-        else {
-            document.getElementById("memberCheckAll").checked = false;
-        }
+        // if (btn.checked) {
+        //     var checkAll = true;
+        //     for (i = 0; i < document.all("memberCheck").length; i++) {
+        //         if (document.all("memberCheck")[i].checked == false) {
+        //             checkAll = false;
+        //         }
+        //     }
+        //
+        //     if (checkAll) {
+        //         document.getElementById("memberCheckAll").checked = true;
+        //     }
+        // }
+        // else {
+        //     document.getElementById("memberCheckAll").checked = false;
+        // }
     }
 
     var authorizeById = function (selectedId) {

house365-hgs-ws-interfaces/src/main/java/com/house365/ws/interfaces/server/IUser.java

@@ -134,8 +134,6 @@ public interface IUser extends IService {
 
     List<DutyStaffEntity> getOndutyById(Integer uid);
 
-    List<UserEntity> getDutyUserByCity(String cityCodes);
-
     List<UserEntity> getManagerByPid(Integer uid, String managername);
 
     UserEntity getLimitLoginById(String name);
@@ -189,4 +187,17 @@ public interface IUser extends IService {
 
     String getCityById(String userId);
 
+    /**
+     * 查询城市值班人员
+     * @param cityCode nj
+     * @return
+     */
+    List<UserEntity> getDutyUserByCity(String cityCode);
+    /**
+     * 查询城市全部可用员工
+     * @param cityCode nj
+     * @return
+     */
+    List<UserEntity> getUserByCity(String cityCode);
+
 }

house365-hgs-ws/src/main/java/com/house365/ws/dao/mapper/UserMapper.java

@@ -25,8 +25,6 @@ public interface UserMapper {
 
     List<DutyStaffEntity> getStaffDutyList();
 
-    List<UserEntity> getDutyUserByCity(Map<String, Object> map);
-
     UserEntity getLimitLoginById(String name);
 
     void updateDutyStaff(DutyStaffEntity staff);
@@ -55,4 +53,8 @@ public interface UserMapper {
 
     String getCityById(String userId);
 
+    List<UserEntity> getDutyUserByCity(Map<String, Object> map);
+
+    List<UserEntity> getUserByCity(Map<String, Object> map);
+
 }

house365-hgs-ws/src/main/java/com/house365/ws/interfaces/impl/UserImpl.java

@@ -131,12 +131,7 @@ public class UserImpl implements IUser {
         return userMapper.getOndutyById(uid);
     }
 
-    @Override
-    public List<UserEntity> getDutyUserByCity(String cityCode) {
-        Map<String,Object> param = new HashMap<>();
-        param.put("cityCode",cityCode);
-        return userMapper.getDutyUserByCity(param);
-    }
+
 
     @Override
     public List<LabelEntity> getCustomerLabelById(LabelEntity labelentity) {
@@ -1147,4 +1142,18 @@ public class UserImpl implements IUser {
     @Override
     public void commit() {
     }
+
+    @Override
+    public List<UserEntity> getDutyUserByCity(String cityCode) {
+        Map<String,Object> param = new HashMap<>();
+        param.put("cityCode",cityCode);
+        return userMapper.getDutyUserByCity(param);
+    }
+
+    @Override
+    public List<UserEntity> getUserByCity(String cityCode) {
+        Map<String,Object> param = new HashMap<>();
+        param.put("cityCode",cityCode);
+        return userMapper.getUserByCity(param);
+    }
 }

house365-hgs-ws/src/main/resources/development/mybatis/UserMapper.xml

@@ -196,6 +196,11 @@
         where a.`deptUrlPath` REGEXP CONCAT('^', (select urlPath from `department` where `descripition` =  #{cityCode})) order by 'b.order'
     </select>
 
+    <select id="getUserByCity" resultMap="infoMap">
+        select a.id,a.realName from user a where a.enabled=1 and
+        a.`deptUrlPath` REGEXP CONCAT('^', (select urlPath from `department` where `descripition` = #{cityCode}))
+    </select>
+
     <select id="getDutyByCondition" resultMap="infoMap3" parameterType="map">
         select id,name,userId,onduty
         FROM duty_staff