1.用户分配调阅页面调整

power-dao/src/main/java/com/manage/vo/Power_Sys_DictVo.java

@@ -17,6 +17,8 @@ public class Power_Sys_DictVo extends Power_Sys_Dict {
 
     private String deptIds;
 
+    private String userName;
+
     public Integer getHospitalId() {
         return hospitalId;
     }
@@ -78,4 +80,12 @@ public class Power_Sys_DictVo extends Power_Sys_Dict {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 }

power-dao/src/main/resources/mapper/Power_UserMapper.xml

@@ -259,6 +259,7 @@
         power_user.dept_id
     )
     where power_user.effective = #{effective,jdbcType=INTEGER} and user_name = #{userName,jdbcType=VARCHAR}  and user_pwd = #{userPwd,jdbcType=VARCHAR}
+    GROUP BY user_id
   </select>
 
   <!--2019-07-31 zengwenhe -->

power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java

@@ -965,9 +965,9 @@ public class PowerServiceImpl implements PowerService  {
                                     tree4.setId(id);
                                     tree4.setParentId(twoLevel);
                                     if(StringUtils.isNotBlank(map.getValue().getHospitalTel())){
-                                        tree4.setName(map.getValue().getSysName()+"-"+map.getValue().getDictArea()+"("+map.getValue().getHospitalTel()+")");
+                                        tree4.setName(map.getValue().getUserName()+"-"+map.getValue().getDictArea()+"("+map.getValue().getHospitalTel()+")");
                                     }else{
-                                        tree4.setName(map.getValue().getSysName()+"-"+map.getValue().getDictArea());
+                                        tree4.setName(map.getValue().getUserName()+"-"+map.getValue().getDictArea());
                                     }
                                     tree4.setSelfId(map.getKey());
                                     tree4.setRoleId(map.getValue().getParentId());