my-csc-config-file.git пре 5 година
родитељ
комит
5a907dc4b0

+ 0 - 1
src/main/java/com/unissoft/service/MyUserDetailService.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
4
 import com.unissoft.dto.BaseDto;
4
 import com.unissoft.dto.BaseDto;
5
 import com.unissoft.exception.MyRuntimeException;
5
 import com.unissoft.exception.MyRuntimeException;
6
 import com.unissoft.mapper.PublicMapper;
6
 import com.unissoft.mapper.PublicMapper;
7
-import com.unissoft.model.SysUser;
8
 import com.unissoft.model.SysUserPO;
7
 import com.unissoft.model.SysUserPO;
9
 import com.unissoft.result.ResultEnum;
8
 import com.unissoft.result.ResultEnum;
10
 import com.unissoft.result.ResultView;
9
 import com.unissoft.result.ResultView;

+ 4 - 0
src/main/resources/mapper/PublicMapper.xml

@@ -51,6 +51,8 @@
51
         <result column="homeType" property="homeType"/>
51
         <result column="homeType" property="homeType"/>
52
         <result column="depotId" property="depotId"/>
52
         <result column="depotId" property="depotId"/>
53
         <result column="storehouseIds" property="storehouseIds"/>
53
         <result column="storehouseIds" property="storehouseIds"/>
54
+        <result column="companyName" property="companyName"/>
55
+        <result column="departmentName" property="departmentName"/>
54
         <result column="roleIds" property="roleIds"/>
56
         <result column="roleIds" property="roleIds"/>
55
         <result column="roleName" property="roleName"/>
57
         <result column="roleName" property="roleName"/>
56
     </resultMap>
58
     </resultMap>
@@ -63,6 +65,8 @@
63
         u.home_type homeType,
65
         u.home_type homeType,
64
         p.depot_id depotId,
66
         p.depot_id depotId,
65
         p.storehouse_ids storehouseIds,
67
         p.storehouse_ids storehouseIds,
68
+        p.company_name companyName,
69
+	    p.department_name departmentName,
66
         r.r_id roleIds,
70
         r.r_id roleIds,
67
         r.r_name roleName
71
         r.r_name roleName
68
     </sql>
72
     </sql>