wms / wms4_andelichi · Commits

Commit 802cf135d008fb76ad79b9c056852b3f6b39b8d3

Authored by 易文鹏
1 parent a2de0bd4

系统表ID改为自增长

Inline Side-by-side
Showing 68 changed files with 595 additions and 523 deletions
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailHistoryList.vue
  View file @802cf13
@@ -131,11 +131,11 @@ @@ -131,11 +131,11 @@
131 align:"center", 131 align:"center",
132 dataIndex: 'shipmentCode' 132 dataIndex: 'shipmentCode'
133 }, 133 },
134 - {  
135 - title:'货主编码',  
136 - align:"center",  
137 - dataIndex: 'companyCode'  
138 - }, 134 + // {
  135 + // title:'货主编码',
  136 + // align:"center",
  137 + // dataIndex: 'companyCode'
  138 + // },
139 { 139 {
140 title:'物料编码', 140 title:'物料编码',
141 align:"center", 141 align:"center",
jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java
  View file @802cf13
@@ -25,7 +25,7 @@ public class LogDTO implements Serializable { @@ -25,7 +25,7 @@ public class LogDTO implements Serializable {
25 /**登录用户 */ 25 /**登录用户 */
26 private LoginUser loginUser; 26 private LoginUser loginUser;
27 27
28 - private String id; 28 + private Integer id;
29 private String createBy; 29 private String createBy;
30 private Date createTime; 30 private Date createTime;
31 private Long costTime; 31 private Long costTime;
jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
  View file @802cf13
@@ -26,7 +26,7 @@ public class LoginUser { @@ -26,7 +26,7 @@ public class LoginUser {
26 /** 26 /**
27 * 登录人id 27 * 登录人id
28 */ 28 */
29 - private String id; 29 + private Integer id;
30 30
31 /** 31 /**
32 * 登录人账号 32 * 登录人账号
@@ -78,7 +78,7 @@ public class LoginUser { @@ -78,7 +78,7 @@ public class LoginUser {
78 * 状态(1：正常 2：冻结 ） 78 * 状态(1：正常 2：冻结 ）
79 */ 79 */
80 private Integer status; 80 private Integer status;
81 - 81 +
82 private Integer delFlag; 82 private Integer delFlag;
83 /** 83 /**
84 * 同步工作流引擎1同步0不同步 84 * 同步工作流引擎1同步0不同步
jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java
  View file @802cf13
@@ -27,7 +27,7 @@ public class SysPermissionDataRuleModel { @@ -27,7 +27,7 @@ public class SysPermissionDataRuleModel {
27 /** 27 /**
28 * 对应的菜单id 28 * 对应的菜单id
29 */ 29 */
30 - private String permissionId; 30 + private Integer permissionId;
31 31
32 /** 32 /**
33 * 规则名称 33 * 规则名称
@@ -69,6 +69,14 @@ public class SysPermissionDataRuleModel { @@ -69,6 +69,14 @@ public class SysPermissionDataRuleModel {
69 */ 69 */
70 private String updateBy; 70 private String updateBy;
71 71
  72 + public Integer getPermissionId() {
  73 + return permissionId;
  74 + }
  75 +
  76 + public void setPermissionId(Integer permissionId) {
  77 + this.permissionId = permissionId;
  78 + }
  79 +
72 public String getId() { 80 public String getId() {
73 return id; 81 return id;
74 } 82 }
@@ -77,13 +85,6 @@ public class SysPermissionDataRuleModel { @@ -77,13 +85,6 @@ public class SysPermissionDataRuleModel {
77 this.id = id; 85 this.id = id;
78 } 86 }
79 87
80 - public String getPermissionId() {  
81 - return permissionId;  
82 - }  
83 -  
84 - public void setPermissionId(String permissionId) {  
85 - this.permissionId = permissionId;  
86 - }  
87 88
88 public String getRuleName() { 89 public String getRuleName() {
89 return ruleName; 90 return ruleName;
jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java
  View file @802cf13
@@ -31,9 +31,9 @@ public class BaseCommonServiceImpl implements BaseCommonService { @@ -31,9 +31,9 @@ public class BaseCommonServiceImpl implements BaseCommonService {
31 31
32 @Override 32 @Override
33 public void addLog(LogDTO logDTO) { 33 public void addLog(LogDTO logDTO) {
34 - if(oConvertUtils.isEmpty(logDTO.getId())){  
35 - logDTO.setId(String.valueOf(IdWorker.getId()));  
36 - } 34 + //if(oConvertUtils.isEmpty(logDTO.getId())){
  35 + // logDTO.setId(String.valueOf(IdWorker.getId()));
  36 + //}
37 //保存日志（异常捕获处理，防止数据太大存储失败，导致业务失败）JT-238 37 //保存日志（异常捕获处理，防止数据太大存储失败，导致业务失败）JT-238
38 try { 38 try {
39 baseCommonMapper.saveLog(logDTO); 39 baseCommonMapper.saveLog(logDTO);
@@ -46,7 +46,7 @@ public class BaseCommonServiceImpl implements BaseCommonService { @@ -46,7 +46,7 @@ public class BaseCommonServiceImpl implements BaseCommonService {
46 @Override 46 @Override
47 public void addLog(String logContent, Integer logType, Integer operatetype, LoginUser user) { 47 public void addLog(String logContent, Integer logType, Integer operatetype, LoginUser user) {
48 LogDTO sysLog = new LogDTO(); 48 LogDTO sysLog = new LogDTO();
49 - sysLog.setId(String.valueOf(IdWorker.getId())); 49 + //sysLog.setId(String.valueOf(IdWorker.getId()));
50 //注解上的描述,操作日志内容 50 //注解上的描述,操作日志内容
51 sysLog.setLogContent(logContent); 51 sysLog.setLogContent(logContent);
52 sysLog.setLogType(logType); 52 sysLog.setLogType(logType);
jeecg-boot-master/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java
  View file @802cf13
@@ -30,7 +30,7 @@ import java.util.List; @@ -30,7 +30,7 @@ import java.util.List;
30 public class JeecgDemoServiceImpl extends ServiceImpl<JeecgDemoMapper, JeecgDemo> implements IJeecgDemoService { 30 public class JeecgDemoServiceImpl extends ServiceImpl<JeecgDemoMapper, JeecgDemo> implements IJeecgDemoService {
31 @Autowired 31 @Autowired
32 JeecgDemoMapper jeecgDemoMapper; 32 JeecgDemoMapper jeecgDemoMapper;
33 - 33 +
34 /** 34 /**
35 * 事务控制在service层面 35 * 事务控制在service层面
36 * 加上注解：@Transactional，声明的方法就是一个独立的事务（有异常DB操作全部回滚） 36 * 加上注解：@Transactional，声明的方法就是一个独立的事务（有异常DB操作全部回滚）
@@ -42,14 +42,14 @@ public class JeecgDemoServiceImpl extends ServiceImpl&lt;JeecgDemoMapper, JeecgDemo @@ -42,14 +42,14 @@ public class JeecgDemoServiceImpl extends ServiceImpl&lt;JeecgDemoMapper, JeecgDemo
42 pp.setAge(1111); 42 pp.setAge(1111);
43 pp.setName("测试事务 小白兔 1"); 43 pp.setName("测试事务 小白兔 1");
44 jeecgDemoMapper.insert(pp); 44 jeecgDemoMapper.insert(pp);
45 - 45 +
46 JeecgDemo pp2 = new JeecgDemo(); 46 JeecgDemo pp2 = new JeecgDemo();
47 pp2.setAge(2222); 47 pp2.setAge(2222);
48 pp2.setName("测试事务 小白兔 2"); 48 pp2.setName("测试事务 小白兔 2");
49 jeecgDemoMapper.insert(pp2); 49 jeecgDemoMapper.insert(pp2);
50 - 50 +
51 Integer.parseInt("hello");//自定义异常 51 Integer.parseInt("hello");//自定义异常
52 - 52 +
53 JeecgDemo pp3 = new JeecgDemo(); 53 JeecgDemo pp3 = new JeecgDemo();
54 pp3.setAge(3333); 54 pp3.setAge(3333);
55 pp3.setName("测试事务 小白兔 3"); 55 pp3.setName("测试事务 小白兔 3");
@@ -90,7 +90,7 @@ public class JeecgDemoServiceImpl extends ServiceImpl&lt;JeecgDemoMapper, JeecgDemo @@ -90,7 +90,7 @@ public class JeecgDemoServiceImpl extends ServiceImpl&lt;JeecgDemoMapper, JeecgDemo
90 //查询配置菜单有效字段 90 //查询配置菜单有效字段
91 List<String> allAuth = this.jeecgDemoMapper.queryAllAuth(permsPrefix); 91 List<String> allAuth = this.jeecgDemoMapper.queryAllAuth(permsPrefix);
92 //查询已授权字段 92 //查询已授权字段
93 - List<String> userAuth = this.jeecgDemoMapper.queryUserAuth(sysUser.getId(),permsPrefix); 93 + List<String> userAuth = this.jeecgDemoMapper.queryUserAuth(sysUser.getId().toString(),permsPrefix);
94 //列出未授权字段 94 //列出未授权字段
95 for(String perms : allAuth){ 95 for(String perms : allAuth){
96 if(!userAuth.contains(perms)){ 96 if(!userAuth.contains(perms)){
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java
  View file @802cf13
@@ -51,11 +51,11 @@ public class CasClientController { @@ -51,11 +51,11 @@ public class CasClientController {
51 private ISysDepartService sysDepartService; 51 private ISysDepartService sysDepartService;
52 @Autowired 52 @Autowired
53 private RedisUtil redisUtil; 53 private RedisUtil redisUtil;
54 - 54 +
55 @Value("${cas.prefixUrl}") 55 @Value("${cas.prefixUrl}")
56 private String prefixUrl; 56 private String prefixUrl;
57 -  
58 - 57 +
  58 +
59 @GetMapping("/validateLogin") 59 @GetMapping("/validateLogin")
60 public Object validateLogin(@RequestParam(name="ticket") String ticket, 60 public Object validateLogin(@RequestParam(name="ticket") String ticket,
61 @RequestParam(name="service") String service, 61 @RequestParam(name="service") String service,
@@ -89,7 +89,7 @@ public class CasClientController { @@ -89,7 +89,7 @@ public class CasClientController {
89 89
90 //获取用户部门信息 90 //获取用户部门信息
91 JSONObject obj = new JSONObject(); 91 JSONObject obj = new JSONObject();
92 - List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId()); 92 + List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId().toString());
93 obj.put("departs", departs); 93 obj.put("departs", departs);
94 if (departs == null || departs.size() == 0) { 94 if (departs == null || departs.size() == 0) {
95 obj.put("multi_depart", 0); 95 obj.put("multi_depart", 0);
@@ -103,7 +103,7 @@ public class CasClientController { @@ -103,7 +103,7 @@ public class CasClientController {
103 obj.put("userInfo", sysUser); 103 obj.put("userInfo", sysUser);
104 result.setResult(obj); 104 result.setResult(obj);
105 result.success("登录成功"); 105 result.success("登录成功");
106 - 106 +
107 } catch (Exception e) { 107 } catch (Exception e) {
108 //e.printStackTrace(); 108 //e.printStackTrace();
109 result.error500(e.getMessage()); 109 result.error500(e.getMessage());
@@ -111,5 +111,5 @@ public class CasClientController { @@ -111,5 +111,5 @@ public class CasClientController {
111 return new HttpEntity<>(result); 111 return new HttpEntity<>(result);
112 } 112 }
113 113
114 - 114 +
115 } 115 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java
  View file @802cf13
@@ -80,7 +80,7 @@ public class NgAlainServiceImpl implements NgAlainService { @@ -80,7 +80,7 @@ public class NgAlainServiceImpl implements NgAlainService {
80 if(permission.getMenuType()==null) { 80 if(permission.getMenuType()==null) {
81 continue; 81 continue;
82 } 82 }
83 - String tempPid = permission.getParentId(); 83 + String tempPid = String.valueOf(permission.getParentId());
84 JSONObject json = getPermissionJsonObject(permission); 84 JSONObject json = getPermissionJsonObject(permission);
85 if(parentJson==null && oConvertUtils.isEmpty(tempPid)) { 85 if(parentJson==null && oConvertUtils.isEmpty(tempPid)) {
86 jsonArray.add(json); 86 jsonArray.add(json);
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
  View file @802cf13
@@ -397,7 +397,7 @@ public class LoginController { @@ -397,7 +397,7 @@ public class LoginController {
397 String username = sysUser.getUsername(); 397 String username = sysUser.getUsername();
398 // 获取用户部门信息 398 // 获取用户部门信息
399 JSONObject obj = new JSONObject(); 399 JSONObject obj = new JSONObject();
400 - List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId()); 400 + List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId().toString());
401 obj.put("departs", departs); 401 obj.put("departs", departs);
402 if (departs == null || departs.size() == 0) { 402 if (departs == null || departs.size() == 0) {
403 obj.put("multi_depart", 0); 403 obj.put("multi_depart", 0);
@@ -519,7 +519,7 @@ public class LoginController { @@ -519,7 +519,7 @@ public class LoginController {
519 String orgCode = sysUser.getOrgCode(); 519 String orgCode = sysUser.getOrgCode();
520 if(oConvertUtils.isEmpty(orgCode)) { 520 if(oConvertUtils.isEmpty(orgCode)) {
521 //如果当前用户无选择部门 查看部门关联信息 521 //如果当前用户无选择部门 查看部门关联信息
522 - List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId()); 522 + List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId().toString());
523 //update-begin-author:taoyan date:20220117 for: JTC-1068【app】新建用户，没有设置部门及角色，点击登录提示暂未归属部，一直在登录页面 使用手机号登录 可正常 523 //update-begin-author:taoyan date:20220117 for: JTC-1068【app】新建用户，没有设置部门及角色，点击登录提示暂未归属部，一直在登录页面 使用手机号登录 可正常
524 if (departs == null || departs.size() == 0) { 524 if (departs == null || departs.size() == 0) {
525 /*result.error500("用户暂未归属部门,不可登录!"); 525 /*result.error500("用户暂未归属部门,不可登录!");
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
  View file @802cf13
@@ -261,8 +261,8 @@ public class SysAnnouncementController { @@ -261,8 +261,8 @@ public class SysAnnouncementController {
261 // 2.插入用户通告阅读标记表记录 261 // 2.插入用户通告阅读标记表记录
262 String userId = sysAnnouncement.getUserIds(); 262 String userId = sysAnnouncement.getUserIds();
263 String[] userIds = userId.substring(0, (userId.length()-1)).split(","); 263 String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
264 - String anntId = sysAnnouncement.getId();  
265 - Date refDate = new Date(); 264 + //String anntId = sysAnnouncement.getId();
  265 + //Date refDate = new Date();
266 JSONObject obj = new JSONObject(); 266 JSONObject obj = new JSONObject();
267 obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER); 267 obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER);
268 obj.put(WebsocketConst.MSG_ID, sysAnnouncement.getId()); 268 obj.put(WebsocketConst.MSG_ID, sysAnnouncement.getId());
@@ -326,7 +326,7 @@ public class SysAnnouncementController { @@ -326,7 +326,7 @@ public class SysAnnouncementController {
326 public Result<Map<String, Object>> listByUser(@RequestParam(required = false, defaultValue = "5") Integer pageSize) { 326 public Result<Map<String, Object>> listByUser(@RequestParam(required = false, defaultValue = "5") Integer pageSize) {
327 Result<Map<String,Object>> result = new Result<Map<String,Object>>(); 327 Result<Map<String,Object>> result = new Result<Map<String,Object>>();
328 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); 328 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
329 - String userId = sysUser.getId(); 329 + String userId = sysUser.getId().toString();
330 // 1.将系统消息补充到用户通告阅读标记表中 330 // 1.将系统消息补充到用户通告阅读标记表中
331 LambdaQueryWrapper<SysAnnouncement> querySaWrapper = new LambdaQueryWrapper<SysAnnouncement>(); 331 LambdaQueryWrapper<SysAnnouncement> querySaWrapper = new LambdaQueryWrapper<SysAnnouncement>();
332 querySaWrapper.eq(SysAnnouncement::getMsgType,CommonConstant.MSG_TYPE_ALL); // 全部人员 332 querySaWrapper.eq(SysAnnouncement::getMsgType,CommonConstant.MSG_TYPE_ALL); // 全部人员
@@ -349,7 +349,7 @@ public class SysAnnouncementController { @@ -349,7 +349,7 @@ public class SysAnnouncementController {
349 log.info("listByUser接口新增了SysAnnouncementSend：pageSize{}："+pageSize); 349 log.info("listByUser接口新增了SysAnnouncementSend：pageSize{}："+pageSize);
350 SysAnnouncementSend announcementSend = new SysAnnouncementSend(); 350 SysAnnouncementSend announcementSend = new SysAnnouncementSend();
351 announcementSend.setAnntId(announcements.get(i).getId()); 351 announcementSend.setAnntId(announcements.get(i).getId());
352 - announcementSend.setUserId(userId); 352 + announcementSend.setUserId(Integer.valueOf(userId));
353 announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG); 353 announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
354 sysAnnouncementSendService.save(announcementSend); 354 sysAnnouncementSendService.save(announcementSend);
355 log.info("announcementSend.toString()",announcementSend.toString()); 355 log.info("announcementSend.toString()",announcementSend.toString());
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
  View file @802cf13
@@ -91,7 +91,7 @@ public class SysAnnouncementSendController { @@ -91,7 +91,7 @@ public class SysAnnouncementSendController {
91 result.setResult(pageList); 91 result.setResult(pageList);
92 return result; 92 return result;
93 } 93 }
94 - 94 +
95 /** 95 /**
96 * 添加 96 * 添加
97 * @param sysAnnouncementSend 97 * @param sysAnnouncementSend
@@ -109,7 +109,7 @@ public class SysAnnouncementSendController { @@ -109,7 +109,7 @@ public class SysAnnouncementSendController {
109 } 109 }
110 return result; 110 return result;
111 } 111 }
112 - 112 +
113 /** 113 /**
114 * 编辑 114 * 编辑
115 * @param sysAnnouncementSend 115 * @param sysAnnouncementSend
@@ -128,10 +128,10 @@ public class SysAnnouncementSendController { @@ -128,10 +128,10 @@ public class SysAnnouncementSendController {
128 result.success("修改成功!"); 128 result.success("修改成功!");
129 } 129 }
130 } 130 }
131 - 131 +
132 return result; 132 return result;
133 } 133 }
134 - 134 +
135 /** 135 /**
136 * 通过id删除 136 * 通过id删除
137 * @param id 137 * @param id
@@ -149,10 +149,10 @@ public class SysAnnouncementSendController { @@ -149,10 +149,10 @@ public class SysAnnouncementSendController {
149 result.success("删除成功!"); 149 result.success("删除成功!");
150 } 150 }
151 } 151 }
152 - 152 +
153 return result; 153 return result;
154 } 154 }
155 - 155 +
156 /** 156 /**
157 * 批量删除 157 * 批量删除
158 * @param ids 158 * @param ids
@@ -169,7 +169,7 @@ public class SysAnnouncementSendController { @@ -169,7 +169,7 @@ public class SysAnnouncementSendController {
169 } 169 }
170 return result; 170 return result;
171 } 171 }
172 - 172 +
173 /** 173 /**
174 * 通过id查询 174 * 通过id查询
175 * @param id 175 * @param id
@@ -187,7 +187,7 @@ public class SysAnnouncementSendController { @@ -187,7 +187,7 @@ public class SysAnnouncementSendController {
187 } 187 }
188 return result; 188 return result;
189 } 189 }
190 - 190 +
191 /** 191 /**
192 * @功能：更新用户系统消息阅读状态 192 * @功能：更新用户系统消息阅读状态
193 * @param json 193 * @param json
@@ -198,7 +198,7 @@ public class SysAnnouncementSendController { @@ -198,7 +198,7 @@ public class SysAnnouncementSendController {
198 Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>(); 198 Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
199 String anntId = json.getString("anntId"); 199 String anntId = json.getString("anntId");
200 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); 200 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
201 - String userId = sysUser.getId(); 201 + String userId = sysUser.getId().toString();
202 LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda(); 202 LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
203 updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG); 203 updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
204 updateWrapper.set(SysAnnouncementSend::getReadTime, new Date()); 204 updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
@@ -208,7 +208,7 @@ public class SysAnnouncementSendController { @@ -208,7 +208,7 @@ public class SysAnnouncementSendController {
208 result.setSuccess(true); 208 result.setSuccess(true);
209 return result; 209 return result;
210 } 210 }
211 - 211 +
212 /** 212 /**
213 * @功能：获取我的消息 213 * @功能：获取我的消息
214 * @return 214 * @return
@@ -219,8 +219,8 @@ public class SysAnnouncementSendController { @@ -219,8 +219,8 @@ public class SysAnnouncementSendController {
219 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { 219 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
220 Result<IPage<AnnouncementSendModel>> result = new Result<IPage<AnnouncementSendModel>>(); 220 Result<IPage<AnnouncementSendModel>> result = new Result<IPage<AnnouncementSendModel>>();
221 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); 221 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
222 - String userId = sysUser.getId();  
223 - announcementSendModel.setUserId(userId); 222 + String userId = sysUser.getId().toString();
  223 + announcementSendModel.setUserId(Integer.valueOf(userId));
224 announcementSendModel.setPageNo((pageNo-1)*pageSize); 224 announcementSendModel.setPageNo((pageNo-1)*pageSize);
225 announcementSendModel.setPageSize(pageSize); 225 announcementSendModel.setPageSize(pageSize);
226 Page<AnnouncementSendModel> pageList = new Page<AnnouncementSendModel>(pageNo,pageSize); 226 Page<AnnouncementSendModel> pageList = new Page<AnnouncementSendModel>(pageNo,pageSize);
@@ -238,7 +238,7 @@ public class SysAnnouncementSendController { @@ -238,7 +238,7 @@ public class SysAnnouncementSendController {
238 public Result<SysAnnouncementSend> readAll() { 238 public Result<SysAnnouncementSend> readAll() {
239 Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>(); 239 Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
240 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); 240 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
241 - String userId = sysUser.getId(); 241 + String userId = sysUser.getId().toString();
242 LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda(); 242 LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
243 updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG); 243 updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
244 updateWrapper.set(SysAnnouncementSend::getReadTime, new Date()); 244 updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java
  View file @802cf13
@@ -47,7 +47,7 @@ import java.util.stream.Collectors; @@ -47,7 +47,7 @@ import java.util.stream.Collectors;
47 public class SysCategoryController { 47 public class SysCategoryController {
48 @Autowired 48 @Autowired
49 private ISysCategoryService sysCategoryService; 49 private ISysCategoryService sysCategoryService;
50 - 50 +
51 /** 51 /**
52 * 分页列表查询 52 * 分页列表查询
53 * @param sysCategory 53 * @param sysCategory
@@ -65,7 +65,7 @@ public class SysCategoryController { @@ -65,7 +65,7 @@ public class SysCategoryController {
65 sysCategory.setPid("0"); 65 sysCategory.setPid("0");
66 } 66 }
67 Result<IPage<SysCategory>> result = new Result<IPage<SysCategory>>(); 67 Result<IPage<SysCategory>> result = new Result<IPage<SysCategory>>();
68 - 68 +
69 //--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------start 69 //--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------start
70 //--author:liusq---date:20211119 -----for: 【vue3】分类字典页面查询条件配置--------start 70 //--author:liusq---date:20211119 -----for: 【vue3】分类字典页面查询条件配置--------start
71 QueryWrapper<SysCategory> queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, req.getParameterMap()); 71 QueryWrapper<SysCategory> queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, req.getParameterMap());
@@ -84,7 +84,7 @@ public class SysCategoryController { @@ -84,7 +84,7 @@ public class SysCategoryController {
84 result.setResult(pageList); 84 result.setResult(pageList);
85 return result; 85 return result;
86 } 86 }
87 - 87 +
88 @GetMapping(value = "/childList") 88 @GetMapping(value = "/childList")
89 public Result<List<SysCategory>> queryPageList(SysCategory sysCategory,HttpServletRequest req) { 89 public Result<List<SysCategory>> queryPageList(SysCategory sysCategory,HttpServletRequest req) {
90 Result<List<SysCategory>> result = new Result<List<SysCategory>>(); 90 Result<List<SysCategory>> result = new Result<List<SysCategory>>();
@@ -94,8 +94,8 @@ public class SysCategoryController { @@ -94,8 +94,8 @@ public class SysCategoryController {
94 result.setResult(list); 94 result.setResult(list);
95 return result; 95 return result;
96 } 96 }
97 -  
98 - 97 +
  98 +
99 /** 99 /**
100 * 添加 100 * 添加
101 * @param sysCategory 101 * @param sysCategory
@@ -113,7 +113,7 @@ public class SysCategoryController { @@ -113,7 +113,7 @@ public class SysCategoryController {
113 } 113 }
114 return result; 114 return result;
115 } 115 }
116 - 116 +
117 /** 117 /**
118 * 编辑 118 * 编辑
119 * @param sysCategory 119 * @param sysCategory
@@ -131,7 +131,7 @@ public class SysCategoryController { @@ -131,7 +131,7 @@ public class SysCategoryController {
131 } 131 }
132 return result; 132 return result;
133 } 133 }
134 - 134 +
135 /** 135 /**
136 * 通过id删除 136 * 通过id删除
137 * @param id 137 * @param id
@@ -147,10 +147,10 @@ public class SysCategoryController { @@ -147,10 +147,10 @@ public class SysCategoryController {
147 this.sysCategoryService.deleteSysCategory(id); 147 this.sysCategoryService.deleteSysCategory(id);
148 result.success("删除成功!"); 148 result.success("删除成功!");
149 } 149 }
150 - 150 +
151 return result; 151 return result;
152 } 152 }
153 - 153 +
154 /** 154 /**
155 * 批量删除 155 * 批量删除
156 * @param ids 156 * @param ids
@@ -167,7 +167,7 @@ public class SysCategoryController { @@ -167,7 +167,7 @@ public class SysCategoryController {
167 } 167 }
168 return result; 168 return result;
169 } 169 }
170 - 170 +
171 /** 171 /**
172 * 通过id查询 172 * 通过id查询
173 * @param id 173 * @param id
@@ -283,9 +283,9 @@ public class SysCategoryController { @@ -283,9 +283,9 @@ public class SysCategoryController {
283 } 283 }
284 return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage); 284 return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage);
285 } 285 }
286 -  
287 -  
288 - 286 +
  287 +
  288 +
289 /** 289 /**
290 * 加载单个数据 用于回显 290 * 加载单个数据 用于回显
291 */ 291 */
@@ -293,7 +293,7 @@ public class SysCategoryController { @@ -293,7 +293,7 @@ public class SysCategoryController {
293 public Result<SysCategory> loadOne(@RequestParam(name="field") String field,@RequestParam(name="val") String val) { 293 public Result<SysCategory> loadOne(@RequestParam(name="field") String field,@RequestParam(name="val") String val) {
294 Result<SysCategory> result = new Result<SysCategory>(); 294 Result<SysCategory> result = new Result<SysCategory>();
295 try { 295 try {
296 - 296 +
297 QueryWrapper<SysCategory> query = new QueryWrapper<SysCategory>(); 297 QueryWrapper<SysCategory> query = new QueryWrapper<SysCategory>();
298 query.eq(field, val); 298 query.eq(field, val);
299 List<SysCategory> ls = this.sysCategoryService.list(query); 299 List<SysCategory> ls = this.sysCategoryService.list(query);
@@ -314,7 +314,7 @@ public class SysCategoryController { @@ -314,7 +314,7 @@ public class SysCategoryController {
314 } 314 }
315 return result; 315 return result;
316 } 316 }
317 - 317 +
318 /** 318 /**
319 * 加载节点的子数据 319 * 加载节点的子数据
320 */ 320 */
@@ -332,7 +332,7 @@ public class SysCategoryController { @@ -332,7 +332,7 @@ public class SysCategoryController {
332 } 332 }
333 return result; 333 return result;
334 } 334 }
335 - 335 +
336 /** 336 /**
337 * 加载一级节点/如果是同步 则所有数据 337 * 加载一级节点/如果是同步 则所有数据
338 */ 338 */
@@ -353,7 +353,7 @@ public class SysCategoryController { @@ -353,7 +353,7 @@ public class SysCategoryController {
353 } 353 }
354 return result; 354 return result;
355 } 355 }
356 - 356 +
357 /** 357 /**
358 * 递归求子节点 同步加载用到 358 * 递归求子节点 同步加载用到
359 */ 359 */
@@ -473,7 +473,7 @@ public class SysCategoryController { @@ -473,7 +473,7 @@ public class SysCategoryController {
473 } 473 }
474 List<DictModel> rdList = new ArrayList<DictModel>(); 474 List<DictModel> rdList = new ArrayList<DictModel>();
475 for (SysCategory c : list) { 475 for (SysCategory c : list) {
476 - rdList.add(new DictModel(c.getId(),c.getName())); 476 + rdList.add(new DictModel(c.getId().toString(),c.getName()));
477 } 477 }
478 result.setSuccess(true); 478 result.setSuccess(true);
479 result.setResult(rdList); 479 result.setResult(rdList);
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
  View file @802cf13
@@ -45,7 +45,7 @@ import java.util.*; @@ -45,7 +45,7 @@ import java.util.*;
45 * <p> 45 * <p>
46 * 部门表 前端控制器 46 * 部门表 前端控制器
47 * <p> 47 * <p>
48 - * 48 + *
49 * @Author: Steve @Since： 2019-01-22 49 * @Author: Steve @Since： 2019-01-22
50 */ 50 */
51 @RestController 51 @RestController
@@ -93,7 +93,7 @@ public class SysDepartController { @@ -93,7 +93,7 @@ public class SysDepartController {
93 93
94 /** 94 /**
95 * 查询数据 查出所有部门,并以树结构数据格式响应给前端 95 * 查询数据 查出所有部门,并以树结构数据格式响应给前端
96 - * 96 + *
97 * @return 97 * @return
98 */ 98 */
99 @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET) 99 @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
@@ -167,7 +167,7 @@ public class SysDepartController { @@ -167,7 +167,7 @@ public class SysDepartController {
167 167
168 /** 168 /**
169 * 添加新数据 添加用户新建的部门对象数据,并保存到数据库 169 * 添加新数据 添加用户新建的部门对象数据,并保存到数据库
170 - * 170 + *
171 * @param sysDepart 171 * @param sysDepart
172 * @return 172 * @return
173 */ 173 */
@@ -193,7 +193,7 @@ public class SysDepartController { @@ -193,7 +193,7 @@ public class SysDepartController {
193 193
194 /** 194 /**
195 * 编辑数据 编辑部门的部分数据,并保存到数据库 195 * 编辑数据 编辑部门的部分数据,并保存到数据库
196 - * 196 + *
197 * @param sysDepart 197 * @param sysDepart
198 * @return 198 * @return
199 */ 199 */
@@ -219,7 +219,7 @@ public class SysDepartController { @@ -219,7 +219,7 @@ public class SysDepartController {
219 } 219 }
220 return result; 220 return result;
221 } 221 }
222 - 222 +
223 /** 223 /**
224 * 通过id删除 224 * 通过id删除
225 * @param id 225 * @param id
@@ -249,7 +249,7 @@ public class SysDepartController { @@ -249,7 +249,7 @@ public class SysDepartController {
249 249
250 /** 250 /**
251 * 批量删除 根据前端请求的多个ID,对数据库执行删除相关部门数据的操作 251 * 批量删除 根据前端请求的多个ID,对数据库执行删除相关部门数据的操作
252 - * 252 + *
253 * @param ids 253 * @param ids
254 * @return 254 * @return
255 */ 255 */
@@ -270,7 +270,7 @@ public class SysDepartController { @@ -270,7 +270,7 @@ public class SysDepartController {
270 270
271 /** 271 /**
272 * 查询数据 添加或编辑页面对该方法发起请求,以树结构形式加载所有部门的名称,方便用户的操作 272 * 查询数据 添加或编辑页面对该方法发起请求,以树结构形式加载所有部门的名称,方便用户的操作
273 - * 273 + *
274 * @return 274 * @return
275 */ 275 */
276 @RequestMapping(value = "/queryIdTree", method = RequestMethod.GET) 276 @RequestMapping(value = "/queryIdTree", method = RequestMethod.GET)
@@ -304,12 +304,12 @@ public class SysDepartController { @@ -304,12 +304,12 @@ public class SysDepartController {
304 } 304 }
305 return result; 305 return result;
306 } 306 }
307 - 307 +
308 /** 308 /**
309 * <p> 309 * <p>
310 * 部门搜索功能方法,根据关键字模糊搜索相关部门 310 * 部门搜索功能方法,根据关键字模糊搜索相关部门
311 * </p> 311 * </p>
312 - * 312 + *
313 * @param keyWord 313 * @param keyWord
314 * @return 314 * @return
315 */ 315 */
@@ -408,13 +408,13 @@ public class SysDepartController { @@ -408,13 +408,13 @@ public class SysDepartController {
408 if(!parentDept.equals(null)) { 408 if(!parentDept.equals(null)) {
409 sysDepart.setParentId(parentDept.getId()); 409 sysDepart.setParentId(parentDept.getId());
410 } else { 410 } else {
411 - sysDepart.setParentId(""); 411 + sysDepart.setParentId(0);
412 } 412 }
413 }catch (Exception e) { 413 }catch (Exception e) {
414 //没有查找到parentDept 414 //没有查找到parentDept
415 } 415 }
416 }else{ 416 }else{
417 - sysDepart.setParentId(""); 417 + sysDepart.setParentId(0);
418 } 418 }
419 //update-begin---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------ 419 //update-begin---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------
420 sysDepart.setOrgType(sysDepart.getOrgCode().length()/codeLength+""); 420 sysDepart.setOrgType(sysDepart.getOrgCode().length()/codeLength+"");
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java
  View file @802cf13
@@ -76,7 +76,7 @@ public class SysDepartPermissionController extends JeecgController&lt;SysDepartPerm @@ -76,7 +76,7 @@ public class SysDepartPermissionController extends JeecgController&lt;SysDepartPerm
76 IPage<SysDepartPermission> pageList = sysDepartPermissionService.page(page, queryWrapper); 76 IPage<SysDepartPermission> pageList = sysDepartPermissionService.page(page, queryWrapper);
77 return Result.ok(pageList); 77 return Result.ok(pageList);
78 } 78 }
79 - 79 +
80 /** 80 /**
81 * 添加 81 * 添加
82 * 82 *
@@ -89,7 +89,7 @@ public class SysDepartPermissionController extends JeecgController&lt;SysDepartPerm @@ -89,7 +89,7 @@ public class SysDepartPermissionController extends JeecgController&lt;SysDepartPerm
89 sysDepartPermissionService.save(sysDepartPermission); 89 sysDepartPermissionService.save(sysDepartPermission);
90 return Result.ok("添加成功！"); 90 return Result.ok("添加成功！");
91 } 91 }
92 - 92 +
93 /** 93 /**
94 * 编辑 94 * 编辑
95 * 95 *
@@ -102,7 +102,7 @@ public class SysDepartPermissionController extends JeecgController&lt;SysDepartPerm @@ -102,7 +102,7 @@ public class SysDepartPermissionController extends JeecgController&lt;SysDepartPerm
102 sysDepartPermissionService.updateById(sysDepartPermission); 102 sysDepartPermissionService.updateById(sysDepartPermission);
103 return Result.ok("编辑成功!"); 103 return Result.ok("编辑成功!");
104 } 104 }
105 - 105 +
106 /** 106 /**
107 * 通过id删除 107 * 通过id删除
108 * 108 *
@@ -115,7 +115,7 @@ public class SysDepartPermissionController extends JeecgController&lt;SysDepartPerm @@ -115,7 +115,7 @@ public class SysDepartPermissionController extends JeecgController&lt;SysDepartPerm
115 sysDepartPermissionService.removeById(id); 115 sysDepartPermissionService.removeById(id);
116 return Result.ok("删除成功!"); 116 return Result.ok("删除成功!");
117 } 117 }
118 - 118 +
119 /** 119 /**
120 * 批量删除 120 * 批量删除
121 * 121 *
@@ -128,7 +128,7 @@ public class SysDepartPermissionController extends JeecgController&lt;SysDepartPerm @@ -128,7 +128,7 @@ public class SysDepartPermissionController extends JeecgController&lt;SysDepartPerm
128 this.sysDepartPermissionService.removeByIds(Arrays.asList(ids.split(","))); 128 this.sysDepartPermissionService.removeByIds(Arrays.asList(ids.split(",")));
129 return Result.ok("批量删除成功！"); 129 return Result.ok("批量删除成功！");
130 } 130 }
131 - 131 +
132 /** 132 /**
133 * 通过id查询 133 * 通过id查询
134 * 134 *
@@ -278,7 +278,7 @@ public class SysDepartPermissionController extends JeecgController&lt;SysDepartPerm @@ -278,7 +278,7 @@ public class SysDepartPermissionController extends JeecgController&lt;SysDepartPerm
278 query.inSql(SysPermission::getId,"select permission_id from sys_depart_permission where depart_id='"+departId+"'"); 278 query.inSql(SysPermission::getId,"select permission_id from sys_depart_permission where depart_id='"+departId+"'");
279 List<SysPermission> list = sysPermissionService.list(query); 279 List<SysPermission> list = sysPermissionService.list(query);
280 for(SysPermission sysPer : list) { 280 for(SysPermission sysPer : list) {
281 - ids.add(sysPer.getId()); 281 + ids.add(sysPer.getId().toString());
282 } 282 }
283 List<TreeModel> treeList = new ArrayList<>(); 283 List<TreeModel> treeList = new ArrayList<>();
284 getTreeModelList(treeList, list, null); 284 getTreeModelList(treeList, list, null);
@@ -295,8 +295,8 @@ public class SysDepartPermissionController extends JeecgController&lt;SysDepartPerm @@ -295,8 +295,8 @@ public class SysDepartPermissionController extends JeecgController&lt;SysDepartPerm
295 295
296 private void getTreeModelList(List<TreeModel> treeList, List<SysPermission> metaList, TreeModel temp) { 296 private void getTreeModelList(List<TreeModel> treeList, List<SysPermission> metaList, TreeModel temp) {
297 for (SysPermission permission : metaList) { 297 for (SysPermission permission : metaList) {
298 - String tempPid = permission.getParentId();  
299 - TreeModel tree = new TreeModel(permission.getId(), tempPid, permission.getName(),permission.getRuleFlag(), permission.isLeaf()); 298 + String tempPid = String.valueOf(permission.getParentId());
  299 + TreeModel tree = new TreeModel(permission.getId().toString(), tempPid, permission.getName(),permission.getRuleFlag(), permission.isLeaf());
300 if(temp==null && oConvertUtils.isEmpty(tempPid)) { 300 if(temp==null && oConvertUtils.isEmpty(tempPid)) {
301 treeList.add(tree); 301 treeList.add(tree);
302 if(!tree.getIsLeaf()) { 302 if(!tree.getIsLeaf()) {
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
  View file @802cf13
@@ -54,7 +54,7 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys @@ -54,7 +54,7 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys
54 54
55 @Autowired 55 @Autowired
56 private ISysDepartService sysDepartService; 56 private ISysDepartService sysDepartService;
57 - 57 +
58 /** 58 /**
59 * 分页列表查询 59 * 分页列表查询
60 * 60 *
@@ -91,7 +91,7 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys @@ -91,7 +91,7 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys
91 IPage<SysDepartRole> pageList = sysDepartRoleService.page(page, queryWrapper); 91 IPage<SysDepartRole> pageList = sysDepartRoleService.page(page, queryWrapper);
92 return Result.ok(pageList); 92 return Result.ok(pageList);
93 } 93 }
94 - 94 +
95 /** 95 /**
96 * 添加 96 * 添加
97 * 97 *
@@ -105,7 +105,7 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys @@ -105,7 +105,7 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys
105 sysDepartRoleService.save(sysDepartRole); 105 sysDepartRoleService.save(sysDepartRole);
106 return Result.ok("添加成功！"); 106 return Result.ok("添加成功！");
107 } 107 }
108 - 108 +
109 /** 109 /**
110 * 编辑 110 * 编辑
111 * 111 *
@@ -119,7 +119,7 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys @@ -119,7 +119,7 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys
119 sysDepartRoleService.updateById(sysDepartRole); 119 sysDepartRoleService.updateById(sysDepartRole);
120 return Result.ok("编辑成功!"); 120 return Result.ok("编辑成功!");
121 } 121 }
122 - 122 +
123 /** 123 /**
124 * 通过id删除 124 * 通过id删除
125 * 125 *
@@ -134,7 +134,7 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys @@ -134,7 +134,7 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys
134 sysDepartRoleService.removeById(id); 134 sysDepartRoleService.removeById(id);
135 return Result.ok("删除成功!"); 135 return Result.ok("删除成功!");
136 } 136 }
137 - 137 +
138 /** 138 /**
139 * 批量删除 139 * 批量删除
140 * 140 *
@@ -149,7 +149,7 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys @@ -149,7 +149,7 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys
149 this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(","))); 149 this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(",")));
150 return Result.ok("批量删除成功！"); 150 return Result.ok("批量删除成功！");
151 } 151 }
152 - 152 +
153 /** 153 /**
154 * 通过id查询 154 * 通过id查询
155 * 155 *
@@ -203,7 +203,10 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys @@ -203,7 +203,10 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys
203 Result<List<SysDepartRoleUser>> result = new Result<>(); 203 Result<List<SysDepartRoleUser>> result = new Result<>();
204 //查询部门下角色 204 //查询部门下角色
205 List<SysDepartRole> roleList = sysDepartRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",departId)); 205 List<SysDepartRole> roleList = sysDepartRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",departId));
206 - List<String> roleIds = roleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); 206 + List<String> roleIds=new ArrayList<>();
  207 + for (SysDepartRole role : roleList) {
  208 + roleIds.add(role.getId().toString());
  209 + }
207 //根据角色id,用户id查询已授权角色 210 //根据角色id,用户id查询已授权角色
208 List<SysDepartRoleUser> roleUserList = null; 211 List<SysDepartRoleUser> roleUserList = null;
209 if(roleIds!=null && roleIds.size()>0){ 212 if(roleIds!=null && roleIds.size()>0){
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
  View file @802cf13
@@ -462,7 +462,7 @@ public class SysDictController { @@ -462,7 +462,7 @@ public class SysDictController {
462 SysDictPage vo = new SysDictPage(); 462 SysDictPage vo = new SysDictPage();
463 BeanUtils.copyProperties(dictMain, vo); 463 BeanUtils.copyProperties(dictMain, vo);
464 // 查询机票 464 // 查询机票
465 - List<SysDictItem> sysDictItemList = sysDictItemService.selectItemsByMainId(dictMain.getId()); 465 + List<SysDictItem> sysDictItemList = sysDictItemService.selectItemsByMainId(dictMain.getId().toString());
466 vo.setSysDictItemList(sysDictItemList); 466 vo.setSysDictItemList(sysDictItemList);
467 pageList.add(vo); 467 pageList.add(vo);
468 } 468 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java
  View file @802cf13
@@ -45,7 +45,7 @@ public class SysDictItemController { @@ -45,7 +45,7 @@ public class SysDictItemController {
45 45
46 @Autowired 46 @Autowired
47 private ISysDictItemService sysDictItemService; 47 private ISysDictItemService sysDictItemService;
48 - 48 +
49 /** 49 /**
50 * @功能：查询字典数据 50 * @功能：查询字典数据
51 * @param sysDictItem 51 * @param sysDictItem
@@ -66,7 +66,7 @@ public class SysDictItemController { @@ -66,7 +66,7 @@ public class SysDictItemController {
66 result.setResult(pageList); 66 result.setResult(pageList);
67 return result; 67 return result;
68 } 68 }
69 - 69 +
70 /** 70 /**
71 * @功能：新增 71 * @功能：新增
72 * @return 72 * @return
@@ -86,7 +86,7 @@ public class SysDictItemController { @@ -86,7 +86,7 @@ public class SysDictItemController {
86 } 86 }
87 return result; 87 return result;
88 } 88 }
89 - 89 +
90 /** 90 /**
91 * @功能：编辑 91 * @功能：编辑
92 * @param sysDictItem 92 * @param sysDictItem
@@ -110,7 +110,7 @@ public class SysDictItemController { @@ -110,7 +110,7 @@ public class SysDictItemController {
110 } 110 }
111 return result; 111 return result;
112 } 112 }
113 - 113 +
114 /** 114 /**
115 * @功能：删除字典数据 115 * @功能：删除字典数据
116 * @param id 116 * @param id
@@ -132,7 +132,7 @@ public class SysDictItemController { @@ -132,7 +132,7 @@ public class SysDictItemController {
132 } 132 }
133 return result; 133 return result;
134 } 134 }
135 - 135 +
136 /** 136 /**
137 * @功能：批量删除字典数据 137 * @功能：批量删除字典数据
138 * @param ids 138 * @param ids
@@ -165,7 +165,7 @@ public class SysDictItemController { @@ -165,7 +165,7 @@ public class SysDictItemController {
165 LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>(); 165 LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>();
166 queryWrapper.eq(SysDictItem::getItemValue,sysDictItem.getItemValue()); 166 queryWrapper.eq(SysDictItem::getItemValue,sysDictItem.getItemValue());
167 queryWrapper.eq(SysDictItem::getDictId,sysDictItem.getDictId()); 167 queryWrapper.eq(SysDictItem::getDictId,sysDictItem.getDictId());
168 - if (StringUtils.isNotBlank(sysDictItem.getId())) { 168 + if (sysDictItem.getId() != null && sysDictItem.getId().toString().length() > 0) {
169 // 编辑页面校验 169 // 编辑页面校验
170 queryWrapper.ne(SysDictItem::getId,sysDictItem.getId()); 170 queryWrapper.ne(SysDictItem::getId,sysDictItem.getId());
171 } 171 }
@@ -179,5 +179,5 @@ public class SysDictItemController { @@ -179,5 +179,5 @@ public class SysDictItemController {
179 return Result.error("该值不可用，系统中已存在！"); 179 return Result.error("该值不可用，系统中已存在！");
180 } 180 }
181 } 181 }
182 - 182 +
183 } 183 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
  View file @802cf13
@@ -159,7 +159,7 @@ public class SysPermissionController { @@ -159,7 +159,7 @@ public class SysPermissionController {
159 List<SysPermission> list = sysPermissionService.list(query); 159 List<SysPermission> list = sysPermissionService.list(query);
160 Map<String, List<SysPermissionTree>> listMap = new HashMap<>(); 160 Map<String, List<SysPermissionTree>> listMap = new HashMap<>();
161 for (SysPermission item : list) { 161 for (SysPermission item : list) {
162 - String pid = item.getParentId(); 162 + String pid = String.valueOf(item.getParentId());
163 if (parentIdList.contains(pid)) { 163 if (parentIdList.contains(pid)) {
164 List<SysPermissionTree> mapList = listMap.get(pid); 164 List<SysPermissionTree> mapList = listMap.get(pid);
165 if (mapList == null) { 165 if (mapList == null) {
@@ -410,7 +410,7 @@ public class SysPermissionController { @@ -410,7 +410,7 @@ public class SysPermissionController {
410 query.orderByAsc(SysPermission::getSortNo); 410 query.orderByAsc(SysPermission::getSortNo);
411 List<SysPermission> list = sysPermissionService.list(query); 411 List<SysPermission> list = sysPermissionService.list(query);
412 for (SysPermission sysPer : list) { 412 for (SysPermission sysPer : list) {
413 - ids.add(sysPer.getId()); 413 + ids.add(sysPer.getId().toString());
414 } 414 }
415 List<TreeModel> treeList = new ArrayList<>(); 415 List<TreeModel> treeList = new ArrayList<>();
416 getTreeModelList(treeList, list, null); 416 getTreeModelList(treeList, list, null);
@@ -493,7 +493,7 @@ public class SysPermissionController { @@ -493,7 +493,7 @@ public class SysPermissionController {
493 493
494 private void getTreeList(List<SysPermissionTree> treeList, List<SysPermission> metaList, SysPermissionTree temp) { 494 private void getTreeList(List<SysPermissionTree> treeList, List<SysPermission> metaList, SysPermissionTree temp) {
495 for (SysPermission permission : metaList) { 495 for (SysPermission permission : metaList) {
496 - String tempPid = permission.getParentId(); 496 + String tempPid = String.valueOf(permission.getParentId());
497 SysPermissionTree tree = new SysPermissionTree(permission); 497 SysPermissionTree tree = new SysPermissionTree(permission);
498 if (temp == null && oConvertUtils.isEmpty(tempPid)) { 498 if (temp == null && oConvertUtils.isEmpty(tempPid)) {
499 treeList.add(tree); 499 treeList.add(tree);
@@ -512,7 +512,7 @@ public class SysPermissionController { @@ -512,7 +512,7 @@ public class SysPermissionController {
512 512
513 private void getTreeModelList(List<TreeModel> treeList, List<SysPermission> metaList, TreeModel temp) { 513 private void getTreeModelList(List<TreeModel> treeList, List<SysPermission> metaList, TreeModel temp) {
514 for (SysPermission permission : metaList) { 514 for (SysPermission permission : metaList) {
515 - String tempPid = permission.getParentId(); 515 + String tempPid = String.valueOf(permission.getParentId());
516 TreeModel tree = new TreeModel(permission); 516 TreeModel tree = new TreeModel(permission);
517 if (temp == null && oConvertUtils.isEmpty(tempPid)) { 517 if (temp == null && oConvertUtils.isEmpty(tempPid)) {
518 treeList.add(tree); 518 treeList.add(tree);
@@ -603,7 +603,7 @@ public class SysPermissionController { @@ -603,7 +603,7 @@ public class SysPermissionController {
603 if (permission.getMenuType() == null) { 603 if (permission.getMenuType() == null) {
604 continue; 604 continue;
605 } 605 }
606 - String tempPid = permission.getParentId(); 606 + String tempPid = String.valueOf(permission.getParentId());
607 JSONObject json = getPermissionJsonObject(permission); 607 JSONObject json = getPermissionJsonObject(permission);
608 if(json==null) { 608 if(json==null) {
609 continue; 609 continue;
@@ -781,7 +781,7 @@ public class SysPermissionController { @@ -781,7 +781,7 @@ public class SysPermissionController {
781 */ 781 */
782 @RequestMapping(value = "/getPermRuleListByPermId", method = RequestMethod.GET) 782 @RequestMapping(value = "/getPermRuleListByPermId", method = RequestMethod.GET)
783 public Result<List<SysPermissionDataRule>> getPermRuleListByPermId(SysPermissionDataRule sysPermissionDataRule) { 783 public Result<List<SysPermissionDataRule>> getPermRuleListByPermId(SysPermissionDataRule sysPermissionDataRule) {
784 - List<SysPermissionDataRule> permRuleList = sysPermissionDataRuleService.getPermRuleListByPermId(sysPermissionDataRule.getPermissionId()); 784 + List<SysPermissionDataRule> permRuleList = sysPermissionDataRuleService.getPermRuleListByPermId(sysPermissionDataRule.getPermissionId().toString());
785 Result<List<SysPermissionDataRule>> result = new Result<>(); 785 Result<List<SysPermissionDataRule>> result = new Result<>();
786 result.setSuccess(true); 786 result.setSuccess(true);
787 result.setResult(permRuleList); 787 result.setResult(permRuleList);
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
  View file @802cf13
@@ -71,13 +71,13 @@ import lombok.extern.slf4j.Slf4j; @@ -71,13 +71,13 @@ import lombok.extern.slf4j.Slf4j;
71 public class SysRoleController { 71 public class SysRoleController {
72 @Autowired 72 @Autowired
73 private ISysRoleService sysRoleService; 73 private ISysRoleService sysRoleService;
74 - 74 +
75 @Autowired 75 @Autowired
76 private ISysPermissionDataRuleService sysPermissionDataRuleService; 76 private ISysPermissionDataRuleService sysPermissionDataRuleService;
77 - 77 +
78 @Autowired 78 @Autowired
79 private ISysRolePermissionService sysRolePermissionService; 79 private ISysRolePermissionService sysRolePermissionService;
80 - 80 +
81 @Autowired 81 @Autowired
82 private ISysPermissionService sysPermissionService; 82 private ISysPermissionService sysPermissionService;
83 83
@@ -102,7 +102,7 @@ public class SysRoleController { @@ -102,7 +102,7 @@ public class SysRoleController {
102 result.setResult(pageList); 102 result.setResult(pageList);
103 return result; 103 return result;
104 } 104 }
105 - 105 +
106 /** 106 /**
107 * 添加 107 * 添加
108 * @param role 108 * @param role
@@ -122,7 +122,7 @@ public class SysRoleController { @@ -122,7 +122,7 @@ public class SysRoleController {
122 } 122 }
123 return result; 123 return result;
124 } 124 }
125 - 125 +
126 /** 126 /**
127 * 编辑 127 * 编辑
128 * @param role 128 * @param role
@@ -143,10 +143,10 @@ public class SysRoleController { @@ -143,10 +143,10 @@ public class SysRoleController {
143 result.success("修改成功!"); 143 result.success("修改成功!");
144 } 144 }
145 } 145 }
146 - 146 +
147 return result; 147 return result;
148 } 148 }
149 - 149 +
150 /** 150 /**
151 * 通过id删除 151 * 通过id删除
152 * @param id 152 * @param id
@@ -158,7 +158,7 @@ public class SysRoleController { @@ -158,7 +158,7 @@ public class SysRoleController {
158 sysRoleService.deleteRole(id); 158 sysRoleService.deleteRole(id);
159 return Result.ok("删除角色成功"); 159 return Result.ok("删除角色成功");
160 } 160 }
161 - 161 +
162 /** 162 /**
163 * 批量删除 163 * 批量删除
164 * @param ids 164 * @param ids
@@ -176,7 +176,7 @@ public class SysRoleController { @@ -176,7 +176,7 @@ public class SysRoleController {
176 } 176 }
177 return result; 177 return result;
178 } 178 }
179 - 179 +
180 /** 180 /**
181 * 通过id查询 181 * 通过id查询
182 * @param id 182 * @param id
@@ -194,7 +194,7 @@ public class SysRoleController { @@ -194,7 +194,7 @@ public class SysRoleController {
194 } 194 }
195 return result; 195 return result;
196 } 196 }
197 - 197 +
198 @RequestMapping(value = "/queryall", method = RequestMethod.GET) 198 @RequestMapping(value = "/queryall", method = RequestMethod.GET)
199 public Result<List<SysRole>> queryall() { 199 public Result<List<SysRole>> queryall() {
200 Result<List<SysRole>> result = new Result<>(); 200 Result<List<SysRole>> result = new Result<>();
@@ -207,7 +207,7 @@ public class SysRoleController { @@ -207,7 +207,7 @@ public class SysRoleController {
207 } 207 }
208 return result; 208 return result;
209 } 209 }
210 - 210 +
211 /** 211 /**
212 * 校验角色编码唯一 212 * 校验角色编码唯一
213 */ 213 */
@@ -297,7 +297,7 @@ public class SysRoleController { @@ -297,7 +297,7 @@ public class SysRoleController {
297 } 297 }
298 return Result.error("文件导入失败！"); 298 return Result.error("文件导入失败！");
299 } 299 }
300 - 300 +
301 /** 301 /**
302 * 查询数据规则数据 302 * 查询数据规则数据
303 */ 303 */
@@ -326,7 +326,7 @@ public class SysRoleController { @@ -326,7 +326,7 @@ public class SysRoleController {
326 //TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key 326 //TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key
327 } 327 }
328 } 328 }
329 - 329 +
330 /** 330 /**
331 * 保存数据规则至角色菜单关联表 331 * 保存数据规则至角色菜单关联表
332 */ 332 */
@@ -353,8 +353,8 @@ public class SysRoleController { @@ -353,8 +353,8 @@ public class SysRoleController {
353 } 353 }
354 return Result.ok("保存成功!"); 354 return Result.ok("保存成功!");
355 } 355 }
356 -  
357 - 356 +
  357 +
358 /** 358 /**
359 * 用户角色授权功能，查询菜单权限树 359 * 用户角色授权功能，查询菜单权限树
360 * @param request 360 * @param request
@@ -371,7 +371,7 @@ public class SysRoleController { @@ -371,7 +371,7 @@ public class SysRoleController {
371 query.orderByAsc(SysPermission::getSortNo); 371 query.orderByAsc(SysPermission::getSortNo);
372 List<SysPermission> list = sysPermissionService.list(query); 372 List<SysPermission> list = sysPermissionService.list(query);
373 for(SysPermission sysPer : list) { 373 for(SysPermission sysPer : list) {
374 - ids.add(sysPer.getId()); 374 + ids.add(sysPer.getId().toString());
375 } 375 }
376 List<TreeModel> treeList = new ArrayList<>(); 376 List<TreeModel> treeList = new ArrayList<>();
377 getTreeModelList(treeList, list, null); 377 getTreeModelList(treeList, list, null);
@@ -385,11 +385,11 @@ public class SysRoleController { @@ -385,11 +385,11 @@ public class SysRoleController {
385 } 385 }
386 return result; 386 return result;
387 } 387 }
388 - 388 +
389 private void getTreeModelList(List<TreeModel> treeList,List<SysPermission> metaList,TreeModel temp) { 389 private void getTreeModelList(List<TreeModel> treeList,List<SysPermission> metaList,TreeModel temp) {
390 for (SysPermission permission : metaList) { 390 for (SysPermission permission : metaList) {
391 - String tempPid = permission.getParentId();  
392 - TreeModel tree = new TreeModel(permission.getId(), tempPid, permission.getName(),permission.getRuleFlag(), permission.isLeaf()); 391 + String tempPid = String.valueOf(permission.getParentId());
  392 + TreeModel tree = new TreeModel(permission.getId().toString(), tempPid, permission.getName(),permission.getRuleFlag(), permission.isLeaf());
393 if(temp==null && oConvertUtils.isEmpty(tempPid)) { 393 if(temp==null && oConvertUtils.isEmpty(tempPid)) {
394 treeList.add(tree); 394 treeList.add(tree);
395 if(!tree.getIsLeaf()) { 395 if(!tree.getIsLeaf()) {
@@ -401,9 +401,9 @@ public class SysRoleController { @@ -401,9 +401,9 @@ public class SysRoleController {
401 getTreeModelList(treeList, metaList, tree); 401 getTreeModelList(treeList, metaList, tree);
402 } 402 }
403 } 403 }
404 - 404 +
405 } 405 }
406 } 406 }
407 -  
408 - 407 +
  408 +
409 } 409 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  View file @802cf13
@@ -63,7 +63,7 @@ import java.util.stream.Collectors; @@ -63,7 +63,7 @@ import java.util.stream.Collectors;
63 public class SysUserController { 63 public class SysUserController {
64 @Autowired 64 @Autowired
65 private ISysBaseAPI sysBaseAPI; 65 private ISysBaseAPI sysBaseAPI;
66 - 66 +
67 @Autowired 67 @Autowired
68 private ISysUserService sysUserService; 68 private ISysUserService sysUserService;
69 69
@@ -108,7 +108,7 @@ public class SysUserController { @@ -108,7 +108,7 @@ public class SysUserController {
108 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { 108 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
109 Result<IPage<SysUser>> result = new Result<IPage<SysUser>>(); 109 Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
110 QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap()); 110 QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
111 - 111 +
112 //update-begin-Author:wangshuai--Date:20211119--for:【vue3】通过部门id查询用户，通过code查询id 112 //update-begin-Author:wangshuai--Date:20211119--for:【vue3】通过部门id查询用户，通过code查询id
113 //部门ID 113 //部门ID
114 String departId = req.getParameter("departId"); 114 String departId = req.getParameter("departId");
@@ -116,7 +116,12 @@ public class SysUserController { @@ -116,7 +116,12 @@ public class SysUserController {
116 LambdaQueryWrapper<SysUserDepart> query = new LambdaQueryWrapper<>(); 116 LambdaQueryWrapper<SysUserDepart> query = new LambdaQueryWrapper<>();
117 query.eq(SysUserDepart::getDepId,departId); 117 query.eq(SysUserDepart::getDepId,departId);
118 List<SysUserDepart> list = sysUserDepartService.list(query); 118 List<SysUserDepart> list = sysUserDepartService.list(query);
119 - List<String> userIds = list.stream().map(SysUserDepart::getUserId).collect(Collectors.toList()); 119 +
  120 + //List<String> userIds = list.stream().map(SysUserDepart::getUserId).collect(Collectors.toList());
  121 + List<String> userIds=new ArrayList<>();
  122 + for (SysUserDepart depart : list) {
  123 + userIds.add(depart.getId().toString());
  124 + }
120 queryWrapper.in("id",userIds); 125 queryWrapper.in("id",userIds);
121 } 126 }
122 //用户ID 127 //用户ID
@@ -142,7 +147,12 @@ public class SysUserController { @@ -142,7 +147,12 @@ public class SysUserController {
142 //批量查询用户的所属部门 147 //批量查询用户的所属部门
143 //step.1 先拿到全部的 useids 148 //step.1 先拿到全部的 useids
144 //step.2 通过 useids，一次性查询用户的所属部门名字 149 //step.2 通过 useids，一次性查询用户的所属部门名字
145 - List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList()); 150 + //List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
  151 + List<String> userIds=new ArrayList<>();
  152 + for (SysUser u : pageList.getRecords()) {
  153 + userIds.add(u.getId().toString());
  154 + }
  155 +
146 if(userIds!=null && userIds.size()>0){ 156 if(userIds!=null && userIds.size()>0){
147 Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds); 157 Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
148 pageList.getRecords().forEach(item->{ 158 pageList.getRecords().forEach(item->{
@@ -285,7 +295,7 @@ public class SysUserController { @@ -285,7 +295,7 @@ public class SysUserController {
285 result.error500("未找到用户相关角色信息"); 295 result.error500("未找到用户相关角色信息");
286 } else { 296 } else {
287 for (SysUserRole sysUserRole : userRole) { 297 for (SysUserRole sysUserRole : userRole) {
288 - list.add(sysUserRole.getRoleId()); 298 + list.add(sysUserRole.getRoleId().toString());
289 } 299 }
290 result.setSuccess(true); 300 result.setSuccess(true);
291 result.setResult(list); 301 result.setResult(list);
@@ -399,7 +409,11 @@ public class SysUserController { @@ -399,7 +409,11 @@ public class SysUserController {
399 //批量查询用户的所属部门 409 //批量查询用户的所属部门
400 //step.1 先拿到全部的 useids 410 //step.1 先拿到全部的 useids
401 //step.2 通过 useids，一次性查询用户的所属部门名字 411 //step.2 通过 useids，一次性查询用户的所属部门名字
402 - List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList()); 412 + List<String> userIds=new ArrayList<>();
  413 + for (SysUser user : userList) {
  414 + userIds.add(user.getId().toString());
  415 + }
  416 + //List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
403 if(userIds!=null && userIds.size()>0){ 417 if(userIds!=null && userIds.size()>0){
404 Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds); 418 Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
405 userList.forEach(item->{ 419 userList.forEach(item->{
@@ -528,11 +542,11 @@ public class SysUserController { @@ -528,11 +542,11 @@ public class SysUserController {
528 // 批量将部门和用户信息建立关联关系 542 // 批量将部门和用户信息建立关联关系
529 String departIds = sysUserExcel.getDepartIds(); 543 String departIds = sysUserExcel.getDepartIds();
530 if (StringUtils.isNotBlank(departIds)) { 544 if (StringUtils.isNotBlank(departIds)) {
531 - String userId = sysUserExcel.getId(); 545 + String userId = sysUserExcel.getId().toString();
532 String[] departIdArray = departIds.split(","); 546 String[] departIdArray = departIds.split(",");
533 List<SysUserDepart> userDepartList = new ArrayList<>(departIdArray.length); 547 List<SysUserDepart> userDepartList = new ArrayList<>(departIdArray.length);
534 for (String departId : departIdArray) { 548 for (String departId : departIdArray) {
535 - userDepartList.add(new SysUserDepart(userId, departId)); 549 + userDepartList.add(new SysUserDepart(Integer.valueOf(userId), Integer.valueOf(departId)));
536 } 550 }
537 sysUserDepartService.saveBatch(userDepartList); 551 sysUserDepartService.saveBatch(userDepartList);
538 } 552 }
@@ -615,7 +629,7 @@ public class SysUserController { @@ -615,7 +629,7 @@ public class SysUserController {
615 try { 629 try {
616 String sysRoleId = sysUserRoleVO.getRoleId(); 630 String sysRoleId = sysUserRoleVO.getRoleId();
617 for(String sysUserId:sysUserRoleVO.getUserIdList()) { 631 for(String sysUserId:sysUserRoleVO.getUserIdList()) {
618 - SysUserRole sysUserRole = new SysUserRole(sysUserId,sysRoleId); 632 + SysUserRole sysUserRole = new SysUserRole(Integer.valueOf(sysUserId),Integer.valueOf(sysRoleId));
619 QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<SysUserRole>(); 633 QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<SysUserRole>();
620 queryWrapper.eq("role_id", sysRoleId).eq("user_id",sysUserId); 634 queryWrapper.eq("role_id", sysRoleId).eq("user_id",sysUserId);
621 SysUserRole one = sysUserRoleService.getOne(queryWrapper); 635 SysUserRole one = sysUserRoleService.getOne(queryWrapper);
@@ -708,7 +722,11 @@ public class SysUserController { @@ -708,7 +722,11 @@ public class SysUserController {
708 //批量查询用户的所属部门 722 //批量查询用户的所属部门
709 //step.1 先拿到全部的 useids 723 //step.1 先拿到全部的 useids
710 //step.2 通过 useids，一次性查询用户的所属部门名字 724 //step.2 通过 useids，一次性查询用户的所属部门名字
711 - List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList()); 725 + List<String> userIds=new ArrayList<>();
  726 + for (SysUser s : pageList.getRecords()) {
  727 + userIds.add(s.getId().toString());
  728 + }
  729 + //List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
712 if(userIds!=null && userIds.size()>0){ 730 if(userIds!=null && userIds.size()>0){
713 Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds); 731 Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
714 pageList.getRecords().forEach(item -> { 732 pageList.getRecords().forEach(item -> {
@@ -797,7 +815,7 @@ public class SysUserController { @@ -797,7 +815,7 @@ public class SysUserController {
797 try { 815 try {
798 String sysDepId = sysDepartUsersVO.getDepId(); 816 String sysDepId = sysDepartUsersVO.getDepId();
799 for(String sysUserId:sysDepartUsersVO.getUserIdList()) { 817 for(String sysUserId:sysDepartUsersVO.getUserIdList()) {
800 - SysUserDepart sysUserDepart = new SysUserDepart(null,sysUserId,sysDepId); 818 + SysUserDepart sysUserDepart = new SysUserDepart(null,Integer.valueOf(sysUserId),Integer.valueOf(sysDepId));
801 QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>(); 819 QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>();
802 queryWrapper.eq("dep_id", sysDepId).eq("user_id",sysUserId); 820 queryWrapper.eq("dep_id", sysDepId).eq("user_id",sysUserId);
803 SysUserDepart one = sysUserDepartService.getOne(queryWrapper); 821 SysUserDepart one = sysUserDepartService.getOne(queryWrapper);
@@ -831,7 +849,11 @@ public class SysUserController { @@ -831,7 +849,11 @@ public class SysUserController {
831 boolean b = sysUserDepartService.remove(queryWrapper); 849 boolean b = sysUserDepartService.remove(queryWrapper);
832 if(b){ 850 if(b){
833 List<SysDepartRole> sysDepartRoleList = departRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",depId)); 851 List<SysDepartRole> sysDepartRoleList = departRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",depId));
834 - List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); 852 + List<String> roleIds=new ArrayList<>();
  853 + for (SysDepartRole role : sysDepartRoleList) {
  854 + roleIds.add(role.getId().toString());
  855 + }
  856 + //List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
835 if(roleIds != null && roleIds.size()>0){ 857 if(roleIds != null && roleIds.size()>0){
836 QueryWrapper<SysDepartRoleUser> query = new QueryWrapper<>(); 858 QueryWrapper<SysDepartRoleUser> query = new QueryWrapper<>();
837 query.eq("user_id",userId).in("drole_id",roleIds); 859 query.eq("user_id",userId).in("drole_id",roleIds);
@@ -871,7 +893,7 @@ public class SysUserController { @@ -871,7 +893,7 @@ public class SysUserController {
871 } 893 }
872 return result; 894 return result;
873 } 895 }
874 - 896 +
875 /** 897 /**
876 * 查询当前用户的所有部门/当前部门编码 898 * 查询当前用户的所有部门/当前部门编码
877 * @return 899 * @return
@@ -881,7 +903,7 @@ public class SysUserController { @@ -881,7 +903,7 @@ public class SysUserController {
881 Result<Map<String,Object>> result = new Result<Map<String,Object>>(); 903 Result<Map<String,Object>> result = new Result<Map<String,Object>>();
882 try { 904 try {
883 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); 905 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
884 - List<SysDepart> list = this.sysDepartService.queryUserDeparts(sysUser.getId()); 906 + List<SysDepart> list = this.sysDepartService.queryUserDeparts(sysUser.getId().toString());
885 Map<String,Object> map = new HashMap<String,Object>(); 907 Map<String,Object> map = new HashMap<String,Object>();
886 map.put("list", list); 908 map.put("list", list);
887 map.put("orgCode", sysUser.getOrgCode()); 909 map.put("orgCode", sysUser.getOrgCode());
@@ -894,12 +916,12 @@ public class SysUserController { @@ -894,12 +916,12 @@ public class SysUserController {
894 return result; 916 return result;
895 } 917 }
896 918
897 - 919 +
898 920
899 921
900 /** 922 /**
901 * 用户注册接口 923 * 用户注册接口
902 - * 924 + *
903 * @param jsonObject 925 * @param jsonObject
904 * @param user 926 * @param user
905 * @return 927 * @return
@@ -1037,7 +1059,7 @@ public class SysUserController { @@ -1037,7 +1059,7 @@ public class SysUserController {
1037 result.setSuccess(true); 1059 result.setSuccess(true);
1038 return result; 1060 return result;
1039 } 1061 }
1040 - 1062 +
1041 /** 1063 /**
1042 * 用户更改密码 1064 * 用户更改密码
1043 */ 1065 */
@@ -1081,11 +1103,11 @@ public class SysUserController { @@ -1081,11 +1103,11 @@ public class SysUserController {
1081 return result; 1103 return result;
1082 } 1104 }
1083 } 1105 }
1084 - 1106 +
1085 1107
1086 /** 1108 /**
1087 * 根据TOKEN获取用户的部分信息（返回的数据是可供表单设计器使用的数据） 1109 * 根据TOKEN获取用户的部分信息（返回的数据是可供表单设计器使用的数据）
1088 - * 1110 + *
1089 * @return 1111 * @return
1090 */ 1112 */
1091 @GetMapping("/getUserSectionInfoByToken") 1113 @GetMapping("/getUserSectionInfoByToken")
@@ -1096,7 +1118,7 @@ public class SysUserController { @@ -1096,7 +1118,7 @@ public class SysUserController {
1096 if (oConvertUtils.isEmpty(token)) { 1118 if (oConvertUtils.isEmpty(token)) {
1097 username = JwtUtil.getUserNameByToken(request); 1119 username = JwtUtil.getUserNameByToken(request);
1098 } else { 1120 } else {
1099 - username = JwtUtil.getUsername(token); 1121 + username = JwtUtil.getUsername(token);
1100 } 1122 }
1101 1123
1102 log.debug(" ------ 通过令牌获取部分用户信息，当前用户： " + username); 1124 log.debug(" ------ 通过令牌获取部分用户信息，当前用户： " + username);
@@ -1117,7 +1139,7 @@ public class SysUserController { @@ -1117,7 +1139,7 @@ public class SysUserController {
1117 return Result.error(500, "查询失败:" + e.getMessage()); 1139 return Result.error(500, "查询失败:" + e.getMessage());
1118 } 1140 }
1119 } 1141 }
1120 - 1142 +
1121 /** 1143 /**
1122 * 【APP端接口】获取用户列表 根据用户名和真实名 模糊匹配 1144 * 【APP端接口】获取用户列表 根据用户名和真实名 模糊匹配
1123 * @param keyword 1145 * @param keyword
@@ -1154,7 +1176,7 @@ public class SysUserController { @@ -1154,7 +1176,7 @@ public class SysUserController {
1154 log.error(e.getMessage(), e); 1176 log.error(e.getMessage(), e);
1155 return Result.error(500, "查询失败:" + e.getMessage()); 1177 return Result.error(500, "查询失败:" + e.getMessage());
1156 } 1178 }
1157 - 1179 +
1158 } 1180 }
1159 1181
1160 /** 1182 /**
@@ -1168,7 +1190,11 @@ public class SysUserController { @@ -1168,7 +1190,11 @@ public class SysUserController {
1168 if (logicDeletedUserList.size() > 0) { 1190 if (logicDeletedUserList.size() > 0) {
1169 // 批量查询用户的所属部门 1191 // 批量查询用户的所属部门
1170 // step.1 先拿到全部的 userIds 1192 // step.1 先拿到全部的 userIds
1171 - List<String> userIds = logicDeletedUserList.stream().map(SysUser::getId).collect(Collectors.toList()); 1193 + List<String> userIds=new ArrayList<>();
  1194 + for (SysUser user : logicDeletedUserList) {
  1195 + userIds.add(user.getId().toString());
  1196 + }
  1197 + //List<String> userIds = logicDeletedUserList.stream().map(SysUser::getId).collect(Collectors.toList());
1172 // step.2 通过 userIds，一次性查询用户的所属部门名字 1198 // step.2 通过 userIds，一次性查询用户的所属部门名字
1173 Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds); 1199 Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
1174 logicDeletedUserList.forEach(item -> item.setOrgCode(useDepNames.get(item.getId()))); 1200 logicDeletedUserList.forEach(item -> item.setOrgCode(useDepNames.get(item.getId())));
@@ -1348,7 +1374,11 @@ public class SysUserController { @@ -1348,7 +1374,11 @@ public class SysUserController {
1348 //批量查询用户的所属部门 1374 //批量查询用户的所属部门
1349 //step.1 先拿到全部的 useids 1375 //step.1 先拿到全部的 useids
1350 //step.2 通过 useids，一次性查询用户的所属部门名字 1376 //step.2 通过 useids，一次性查询用户的所属部门名字
1351 - List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList()); 1377 + List<String> userIds=new ArrayList<>();
  1378 + for (SysUser user : pageList.getRecords()) {
  1379 + userIds.add(user.getId().toString());
  1380 + }
  1381 + //List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
1352 if(userIds!=null && userIds.size()>0){ 1382 if(userIds!=null && userIds.size()>0){
1353 Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds); 1383 Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
1354 pageList.getRecords().forEach(item->{ 1384 pageList.getRecords().forEach(item->{
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
  View file @802cf13
@@ -25,8 +25,8 @@ public class SysAnnouncement implements Serializable { @@ -25,8 +25,8 @@ public class SysAnnouncement implements Serializable {
25 /** 25 /**
26 * id 26 * id
27 */ 27 */
28 - @TableId(type = IdType.ASSIGN_ID)  
29 - private java.lang.String id; 28 + @TableId(type = IdType.AUTO)
  29 + private java.lang.Integer id;
30 /** 30 /**
31 * 标题 31 * 标题
32 */ 32 */
@@ -62,7 +62,7 @@ public class SysAnnouncement implements Serializable { @@ -62,7 +62,7 @@ public class SysAnnouncement implements Serializable {
62 @Excel(name = "优先级", width = 15, dicCode = "priority") 62 @Excel(name = "优先级", width = 15, dicCode = "priority")
63 @Dict(dicCode = "priority") 63 @Dict(dicCode = "priority")
64 private java.lang.String priority; 64 private java.lang.String priority;
65 - 65 +
66 /** 66 /**
67 * 消息类型1:通知公告2:系统消息 67 * 消息类型1:通知公告2:系统消息
68 */ 68 */
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java
  View file @802cf13
@@ -19,14 +19,16 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -19,14 +19,16 @@ import org.springframework.format.annotation.DateTimeFormat;
19 @TableName("sys_announcement_send") 19 @TableName("sys_announcement_send")
20 public class SysAnnouncementSend implements Serializable { 20 public class SysAnnouncementSend implements Serializable {
21 private static final long serialVersionUID = 1L; 21 private static final long serialVersionUID = 1L;
22 -  
23 - /**id*/  
24 - @TableId(type = IdType.ASSIGN_ID)  
25 - private java.lang.String id; 22 +
  23 + /**
  24 + * id
  25 + */
  26 + @TableId(type = IdType.AUTO)
  27 + private java.lang.Integer id;
26 /**通告id*/ 28 /**通告id*/
27 - private java.lang.String anntId; 29 + private java.lang.Integer anntId;
28 /**用户id*/ 30 /**用户id*/
29 - private java.lang.String userId; 31 + private java.lang.Integer userId;
30 /**阅读状态（0未读，1已读）*/ 32 /**阅读状态（0未读，1已读）*/
31 private java.lang.String readFlag; 33 private java.lang.String readFlag;
32 /**阅读时间*/ 34 /**阅读时间*/
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java
  View file @802cf13
@@ -28,11 +28,10 @@ import java.util.Date; @@ -28,11 +28,10 @@ import java.util.Date;
28 public class SysCheckRule { 28 public class SysCheckRule {
29 29
30 /** 30 /**
31 - * 主键id 31 + * id
32 */ 32 */
33 - @TableId(type = IdType.ASSIGN_ID)  
34 - @ApiModelProperty(value = "主键id")  
35 - private String id; 33 + @TableId(type = IdType.AUTO)
  34 + private java.lang.Integer id;
36 /** 35 /**
37 * 规则名称 36 * 规则名称
38 */ 37 */
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java
  View file @802cf13
@@ -18,9 +18,12 @@ import lombok.experimental.Accessors; @@ -18,9 +18,12 @@ import lombok.experimental.Accessors;
18 @Accessors(chain = true) 18 @Accessors(chain = true)
19 public class SysDataLog implements Serializable { 19 public class SysDataLog implements Serializable {
20 private static final long serialVersionUID = 1L; 20 private static final long serialVersionUID = 1L;
21 -  
22 - @TableId(type = IdType.ASSIGN_ID)  
23 - private String id; //id' 21 +
  22 + /**
  23 + * id
  24 + */
  25 + @TableId(type = IdType.AUTO)
  26 + private java.lang.Integer id;
24 private String createBy; //创建人登录名称 27 private String createBy; //创建人登录名称
25 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") 28 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
26 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 29 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java
  View file @802cf13
@@ -29,9 +29,8 @@ public class SysDataSource { @@ -29,9 +29,8 @@ public class SysDataSource {
29 /** 29 /**
30 * id 30 * id
31 */ 31 */
32 - @TableId(type = IdType.ASSIGN_ID)  
33 - @ApiModelProperty(value = "id")  
34 - private java.lang.String id; 32 + @TableId(type = IdType.AUTO)
  33 + private java.lang.Integer id;
35 /** 34 /**
36 * 数据源编码 35 * 数据源编码
37 */ 36 */
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
  View file @802cf13
@@ -17,7 +17,7 @@ import java.util.Objects; @@ -17,7 +17,7 @@ import java.util.Objects;
17 * <p> 17 * <p>
18 * 部门表 18 * 部门表
19 * <p> 19 * <p>
20 - * 20 + *
21 * @Author Steve 21 * @Author Steve
22 * @Since 2019-01-22 22 * @Since 2019-01-22
23 */ 23 */
@@ -25,12 +25,14 @@ import java.util.Objects; @@ -25,12 +25,14 @@ import java.util.Objects;
25 @TableName("sys_depart") 25 @TableName("sys_depart")
26 public class SysDepart implements Serializable { 26 public class SysDepart implements Serializable {
27 private static final long serialVersionUID = 1L; 27 private static final long serialVersionUID = 1L;
28 -  
29 - /**ID*/  
30 - @TableId(type = IdType.ASSIGN_ID)  
31 - private String id; 28 +
  29 + /**
  30 + * id
  31 + */
  32 + @TableId(type = IdType.AUTO)
  33 + private java.lang.Integer id;
32 /**父机构ID*/ 34 /**父机构ID*/
33 - private String parentId; 35 + private Integer parentId;
34 /**机构/部门名称*/ 36 /**机构/部门名称*/
35 @Excel(name="机构/部门名称",width=15) 37 @Excel(name="机构/部门名称",width=15)
36 private String departName; 38 private String departName;
@@ -85,7 +87,7 @@ public class SysDepart implements Serializable { @@ -85,7 +87,7 @@ public class SysDepart implements Serializable {
85 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") 87 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
86 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 88 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
87 private Date updateTime; 89 private Date updateTime;
88 - 90 +
89 /** 91 /**
90 * 重写equals方法 92 * 重写equals方法
91 */ 93 */
@@ -129,9 +131,9 @@ public class SysDepart implements Serializable { @@ -129,9 +131,9 @@ public class SysDepart implements Serializable {
129 @Override 131 @Override
130 public int hashCode() { 132 public int hashCode() {
131 133
132 - return Objects.hash(super.hashCode(), id, parentId, departName,  
133 - departNameEn, departNameAbbr, departOrder, description,orgCategory,  
134 - orgType, orgCode, mobile, fax, address, memo, status, 134 + return Objects.hash(super.hashCode(), id, parentId, departName,
  135 + departNameEn, departNameAbbr, departOrder, description,orgCategory,
  136 + orgType, orgCode, mobile, fax, address, memo, status,
135 delFlag, createBy, createTime, updateBy, updateTime); 137 delFlag, createBy, createTime, updateBy, updateTime);
136 } 138 }
137 } 139 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java
  View file @802cf13
@@ -27,19 +27,20 @@ import org.jeecgframework.poi.excel.annotation.Excel; @@ -27,19 +27,20 @@ import org.jeecgframework.poi.excel.annotation.Excel;
27 @Accessors(chain = true) 27 @Accessors(chain = true)
28 @ApiModel(value="sys_depart_permission对象", description="部门权限表") 28 @ApiModel(value="sys_depart_permission对象", description="部门权限表")
29 public class SysDepartPermission { 29 public class SysDepartPermission {
30 -  
31 - /**id*/  
32 - @TableId(type = IdType.ASSIGN_ID)  
33 - @ApiModelProperty(value = "id")  
34 - private java.lang.String id; 30 +
  31 + /**
  32 + * id
  33 + */
  34 + @TableId(type = IdType.AUTO)
  35 + private java.lang.Integer id;
35 /**部门id*/ 36 /**部门id*/
36 @Excel(name = "部门id", width = 15) 37 @Excel(name = "部门id", width = 15)
37 @ApiModelProperty(value = "部门id") 38 @ApiModelProperty(value = "部门id")
38 - private java.lang.String departId; 39 + private java.lang.Integer departId;
39 /**权限id*/ 40 /**权限id*/
40 @Excel(name = "权限id", width = 15) 41 @Excel(name = "权限id", width = 15)
41 @ApiModelProperty(value = "权限id") 42 @ApiModelProperty(value = "权限id")
42 - private java.lang.String permissionId; 43 + private java.lang.Integer permissionId;
43 /**数据规则id*/ 44 /**数据规则id*/
44 @ApiModelProperty(value = "数据规则id") 45 @ApiModelProperty(value = "数据规则id")
45 private java.lang.String dataRuleIds; 46 private java.lang.String dataRuleIds;
@@ -48,7 +49,7 @@ public class SysDepartPermission { @@ -48,7 +49,7 @@ public class SysDepartPermission {
48 49
49 } 50 }
50 51
51 - public SysDepartPermission(String departId, String permissionId) { 52 + public SysDepartPermission(Integer departId, Integer permissionId) {
52 this.departId = departId; 53 this.departId = departId;
53 this.permissionId = permissionId; 54 this.permissionId = permissionId;
54 } 55 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java
  View file @802cf13
@@ -28,16 +28,17 @@ import org.jeecgframework.poi.excel.annotation.Excel; @@ -28,16 +28,17 @@ import org.jeecgframework.poi.excel.annotation.Excel;
28 @Accessors(chain = true) 28 @Accessors(chain = true)
29 @ApiModel(value="sys_depart_role对象", description="部门角色") 29 @ApiModel(value="sys_depart_role对象", description="部门角色")
30 public class SysDepartRole { 30 public class SysDepartRole {
31 -  
32 - /**id*/  
33 - @TableId(type = IdType.ASSIGN_ID)  
34 - @ApiModelProperty(value = "id")  
35 - private java.lang.String id; 31 +
  32 + /**
  33 + * id
  34 + */
  35 + @TableId(type = IdType.AUTO)
  36 + private java.lang.Integer id;
36 /**部门id*/ 37 /**部门id*/
37 @Excel(name = "部门id", width = 15) 38 @Excel(name = "部门id", width = 15)
38 @ApiModelProperty(value = "部门id") 39 @ApiModelProperty(value = "部门id")
39 @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") 40 @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
40 - private java.lang.String departId; 41 + private java.lang.Integer departId;
41 /**部门角色名称*/ 42 /**部门角色名称*/
42 @Excel(name = "部门角色名称", width = 15) 43 @Excel(name = "部门角色名称", width = 15)
43 @ApiModelProperty(value = "部门角色名称") 44 @ApiModelProperty(value = "部门角色名称")
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java
  View file @802cf13
@@ -27,23 +27,24 @@ import org.jeecgframework.poi.excel.annotation.Excel; @@ -27,23 +27,24 @@ import org.jeecgframework.poi.excel.annotation.Excel;
27 @Accessors(chain = true) 27 @Accessors(chain = true)
28 @ApiModel(value="sys_depart_role_permission对象", description="部门角色权限") 28 @ApiModel(value="sys_depart_role_permission对象", description="部门角色权限")
29 public class SysDepartRolePermission { 29 public class SysDepartRolePermission {
30 -  
31 - /**id*/  
32 - @TableId(type = IdType.ASSIGN_ID)  
33 - @ApiModelProperty(value = "id")  
34 - private java.lang.String id; 30 +
  31 + /**
  32 + * id
  33 + */
  34 + @TableId(type = IdType.AUTO)
  35 + private java.lang.Integer id;
35 /**部门id*/ 36 /**部门id*/
36 @Excel(name = "部门id", width = 15) 37 @Excel(name = "部门id", width = 15)
37 @ApiModelProperty(value = "部门id") 38 @ApiModelProperty(value = "部门id")
38 - private java.lang.String departId; 39 + private java.lang.Integer departId;
39 /**角色id*/ 40 /**角色id*/
40 @Excel(name = "角色id", width = 15) 41 @Excel(name = "角色id", width = 15)
41 @ApiModelProperty(value = "角色id") 42 @ApiModelProperty(value = "角色id")
42 - private java.lang.String roleId; 43 + private java.lang.Integer roleId;
43 /**权限id*/ 44 /**权限id*/
44 @Excel(name = "权限id", width = 15) 45 @Excel(name = "权限id", width = 15)
45 @ApiModelProperty(value = "权限id") 46 @ApiModelProperty(value = "权限id")
46 - private java.lang.String permissionId; 47 + private java.lang.Integer permissionId;
47 /**dataRuleIds*/ 48 /**dataRuleIds*/
48 @Excel(name = "dataRuleIds", width = 15) 49 @Excel(name = "dataRuleIds", width = 15)
49 @ApiModelProperty(value = "dataRuleIds") 50 @ApiModelProperty(value = "dataRuleIds")
@@ -60,7 +61,7 @@ public class SysDepartRolePermission { @@ -60,7 +61,7 @@ public class SysDepartRolePermission {
60 public SysDepartRolePermission() { 61 public SysDepartRolePermission() {
61 } 62 }
62 63
63 - public SysDepartRolePermission(String roleId, String permissionId) { 64 + public SysDepartRolePermission(Integer roleId, Integer permissionId) {
64 this.roleId = roleId; 65 this.roleId = roleId;
65 this.permissionId = permissionId; 66 this.permissionId = permissionId;
66 } 67 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java
  View file @802cf13
@@ -27,25 +27,26 @@ import org.jeecgframework.poi.excel.annotation.Excel; @@ -27,25 +27,26 @@ import org.jeecgframework.poi.excel.annotation.Excel;
27 @Accessors(chain = true) 27 @Accessors(chain = true)
28 @ApiModel(value="sys_depart_role_user对象", description="部门角色人员信息") 28 @ApiModel(value="sys_depart_role_user对象", description="部门角色人员信息")
29 public class SysDepartRoleUser { 29 public class SysDepartRoleUser {
30 -  
31 - /**主键id*/  
32 - @TableId(type = IdType.ASSIGN_ID)  
33 - @ApiModelProperty(value = "主键id")  
34 - private java.lang.String id; 30 +
  31 + /**
  32 + * id
  33 + */
  34 + @TableId(type = IdType.AUTO)
  35 + private java.lang.Integer id;
35 /**用户id*/ 36 /**用户id*/
36 @Excel(name = "用户id", width = 15) 37 @Excel(name = "用户id", width = 15)
37 @ApiModelProperty(value = "用户id") 38 @ApiModelProperty(value = "用户id")
38 - private java.lang.String userId; 39 + private java.lang.Integer userId;
39 /**角色id*/ 40 /**角色id*/
40 @Excel(name = "角色id", width = 15) 41 @Excel(name = "角色id", width = 15)
41 @ApiModelProperty(value = "角色id") 42 @ApiModelProperty(value = "角色id")
42 - private java.lang.String droleId; 43 + private java.lang.Integer droleId;
43 44
44 public SysDepartRoleUser() { 45 public SysDepartRoleUser() {
45 46
46 } 47 }
47 48
48 - public SysDepartRoleUser(String userId, String droleId) { 49 + public SysDepartRoleUser(Integer userId, Integer droleId) {
49 this.userId = userId; 50 this.userId = userId;
50 this.droleId = droleId; 51 this.droleId = droleId;
51 } 52 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDict.java
  View file @802cf13
@@ -29,9 +29,9 @@ public class SysDict implements Serializable { @@ -29,9 +29,9 @@ public class SysDict implements Serializable {
29 /** 29 /**
30 * id 30 * id
31 */ 31 */
32 - @TableId(type = IdType.ASSIGN_ID)  
33 - private String id;  
34 - 32 + @TableId(type = IdType.AUTO)
  33 + private java.lang.Integer id;
  34 +
35 /** 35 /**
36 * [预留字段，暂时无用] 36 * [预留字段，暂时无用]
37 * 字典类型,0 string,1 number类型,2 boolean 37 * 字典类型,0 string,1 number类型,2 boolean
@@ -39,7 +39,7 @@ public class SysDict implements Serializable { @@ -39,7 +39,7 @@ public class SysDict implements Serializable {
39 * 默认为string类型 39 * 默认为string类型
40 */ 40 */
41 private Integer type; 41 private Integer type;
42 - 42 +
43 /** 43 /**
44 * 字典名称 44 * 字典名称
45 */ 45 */
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java
  View file @802cf13
@@ -31,13 +31,13 @@ public class SysDictItem implements Serializable { @@ -31,13 +31,13 @@ public class SysDictItem implements Serializable {
31 /** 31 /**
32 * id 32 * id
33 */ 33 */
34 - @TableId(type = IdType.ASSIGN_ID)  
35 - private String id; 34 + @TableId(type = IdType.AUTO)
  35 + private java.lang.Integer id;
36 36
37 /** 37 /**
38 * 字典id 38 * 字典id
39 */ 39 */
40 - private String dictId; 40 + private Integer dictId;
41 41
42 /** 42 /**
43 * 字典项文本 43 * 字典项文本
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java
  View file @802cf13
@@ -26,11 +26,10 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -26,11 +26,10 @@ import org.springframework.format.annotation.DateTimeFormat;
26 public class SysFillRule { 26 public class SysFillRule {
27 27
28 /** 28 /**
29 - * 主键ID 29 + * id
30 */ 30 */
31 - @TableId(type = IdType.ASSIGN_ID)  
32 - @ApiModelProperty(value = "主键ID")  
33 - private java.lang.String id; 31 + @TableId(type = IdType.AUTO)
  32 + private java.lang.Integer id;
34 /** 33 /**
35 * 规则名称 34 * 规则名称
36 */ 35 */
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysLog.java
  View file @802cf13
@@ -30,8 +30,8 @@ public class SysLog implements Serializable { @@ -30,8 +30,8 @@ public class SysLog implements Serializable {
30 /** 30 /**
31 * id 31 * id
32 */ 32 */
33 - @TableId(type = IdType.ASSIGN_ID)  
34 - private String id; 33 + @TableId(type = IdType.AUTO)
  34 + private java.lang.Integer id;
35 35
36 /** 36 /**
37 * 创建人 37 * 创建人
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermission.java
  View file @802cf13
@@ -29,13 +29,13 @@ public class SysPermission implements Serializable { @@ -29,13 +29,13 @@ public class SysPermission implements Serializable {
29 /** 29 /**
30 * id 30 * id
31 */ 31 */
32 - @TableId(type = IdType.ASSIGN_ID)  
33 - private String id; 32 + @TableId(type = IdType.AUTO)
  33 + private java.lang.Integer id;
34 34
35 /** 35 /**
36 * 父id 36 * 父id
37 */ 37 */
38 - private String parentId; 38 + private Integer parentId;
39 39
40 /** 40 /**
41 * 菜单名称 41 * 菜单名称
@@ -60,7 +60,7 @@ public class SysPermission implements Serializable { @@ -60,7 +60,7 @@ public class SysPermission implements Serializable {
60 * 组件 60 * 组件
61 */ 61 */
62 private String component; 62 private String component;
63 - 63 +
64 /** 64 /**
65 * 组件名字 65 * 组件名字
66 */ 66 */
@@ -91,7 +91,7 @@ public class SysPermission implements Serializable { @@ -91,7 +91,7 @@ public class SysPermission implements Serializable {
91 */ 91 */
92 @TableField(value="is_leaf") 92 @TableField(value="is_leaf")
93 private boolean leaf; 93 private boolean leaf;
94 - 94 +
95 /** 95 /**
96 * 是否路由菜单: 0:不是 1:是（默认值1） 96 * 是否路由菜单: 0:不是 1:是（默认值1）
97 */ 97 */
@@ -119,12 +119,12 @@ public class SysPermission implements Serializable { @@ -119,12 +119,12 @@ public class SysPermission implements Serializable {
119 * 删除状态 0正常 1已删除 119 * 删除状态 0正常 1已删除
120 */ 120 */
121 private Integer delFlag; 121 private Integer delFlag;
122 - 122 +
123 /** 123 /**
124 * 是否配置菜单的数据权限 1是0否 默认0 124 * 是否配置菜单的数据权限 1是0否 默认0
125 */ 125 */
126 private Integer ruleFlag; 126 private Integer ruleFlag;
127 - 127 +
128 /** 128 /**
129 * 是否隐藏路由菜单: 0否,1是（默认值0） 129 * 是否隐藏路由菜单: 0否,1是（默认值0）
130 */ 130 */
@@ -149,10 +149,10 @@ public class SysPermission implements Serializable { @@ -149,10 +149,10 @@ public class SysPermission implements Serializable {
149 * 更新时间 149 * 更新时间
150 */ 150 */
151 private Date updateTime; 151 private Date updateTime;
152 - 152 +
153 /**按钮权限状态(0无效1有效)*/ 153 /**按钮权限状态(0无效1有效)*/
154 private java.lang.String status; 154 private java.lang.String status;
155 - 155 +
156 /**alwaysShow*/ 156 /**alwaysShow*/
157 private boolean alwaysShow; 157 private boolean alwaysShow;
158 158
@@ -162,12 +162,13 @@ public class SysPermission implements Serializable { @@ -162,12 +162,13 @@ public class SysPermission implements Serializable {
162 /*update_end author:wuxianquan date:20190908 for:实体增加字段 */ 162 /*update_end author:wuxianquan date:20190908 for:实体增加字段 */
163 163
164 public SysPermission() { 164 public SysPermission() {
165 - 165 +
166 } 166 }
167 public SysPermission(boolean index) { 167 public SysPermission(boolean index) {
168 if(index) { 168 if(index) {
169 - this.id = "9502685863ab87f0ad1134142788a385";  
170 - this.name="首页"; 169 + //this.id = "9502685863ab87f0ad1134142788a385";
  170 + this.id = 1;
  171 + this.name="首页";
171 this.component="dashboard/Analysis"; 172 this.component="dashboard/Analysis";
172 this.componentName="dashboard-analysis"; 173 this.componentName="dashboard-analysis";
173 this.url="/dashboard/analysis"; 174 this.url="/dashboard/analysis";
@@ -182,6 +183,6 @@ public class SysPermission implements Serializable { @@ -182,6 +183,6 @@ public class SysPermission implements Serializable {
182 this.leaf=true; 183 this.leaf=true;
183 this.hidden=false; 184 this.hidden=false;
184 } 185 }
185 - 186 +
186 } 187 }
187 } 188 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java
  View file @802cf13
@@ -22,60 +22,60 @@ import lombok.experimental.Accessors; @@ -22,60 +22,60 @@ import lombok.experimental.Accessors;
22 @EqualsAndHashCode(callSuper = false) 22 @EqualsAndHashCode(callSuper = false)
23 @Accessors(chain = true) 23 @Accessors(chain = true)
24 public class SysPermissionDataRule implements Serializable { 24 public class SysPermissionDataRule implements Serializable {
25 - 25 +
26 private static final long serialVersionUID = 1L; 26 private static final long serialVersionUID = 1L;
27 - 27 +
28 /** 28 /**
29 * id 29 * id
30 */ 30 */
31 - @TableId(type = IdType.ASSIGN_ID)  
32 - private String id;  
33 - 31 + @TableId(type = IdType.AUTO)
  32 + private java.lang.Integer id;
  33 +
34 /** 34 /**
35 * 对应的菜单id 35 * 对应的菜单id
36 */ 36 */
37 - private String permissionId;  
38 - 37 + private Integer permissionId;
  38 +
39 /** 39 /**
40 * 规则名称 40 * 规则名称
41 */ 41 */
42 private String ruleName; 42 private String ruleName;
43 - 43 +
44 /** 44 /**
45 * 字段 45 * 字段
46 */ 46 */
47 private String ruleColumn; 47 private String ruleColumn;
48 - 48 +
49 /** 49 /**
50 * 条件 50 * 条件
51 */ 51 */
52 private String ruleConditions; 52 private String ruleConditions;
53 - 53 +
54 /** 54 /**
55 * 规则值 55 * 规则值
56 */ 56 */
57 private String ruleValue; 57 private String ruleValue;
58 - 58 +
59 /** 59 /**
60 * 状态值 1有效 0无效 60 * 状态值 1有效 0无效
61 */ 61 */
62 private String status; 62 private String status;
63 - 63 +
64 /** 64 /**
65 * 创建时间 65 * 创建时间
66 */ 66 */
67 private Date createTime; 67 private Date createTime;
68 - 68 +
69 /** 69 /**
70 * 创建人 70 * 创建人
71 */ 71 */
72 private String createBy; 72 private String createBy;
73 - 73 +
74 /** 74 /**
75 * 修改时间 75 * 修改时间
76 */ 76 */
77 private Date updateTime; 77 private Date updateTime;
78 - 78 +
79 /** 79 /**
80 * 修改人 80 * 修改人
81 */ 81 */
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPosition.java
  View file @802cf13
@@ -29,9 +29,8 @@ public class SysPosition { @@ -29,9 +29,8 @@ public class SysPosition {
29 /** 29 /**
30 * id 30 * id
31 */ 31 */
32 - @TableId(type = IdType.ASSIGN_ID)  
33 - @ApiModelProperty(value = "id")  
34 - private java.lang.String id; 32 + @TableId(type = IdType.AUTO)
  33 + private java.lang.Integer id;
35 /** 34 /**
36 * 职务编码 35 * 职务编码
37 */ 36 */
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRole.java
  View file @802cf13
@@ -33,21 +33,20 @@ public class SysRole implements Serializable { @@ -33,21 +33,20 @@ public class SysRole implements Serializable {
33 /** 33 /**
34 * id 34 * id
35 */ 35 */
36 - @TableId(type = IdType.ASSIGN_ID)  
37 - private String id;  
38 - 36 + @TableId(type = IdType.AUTO)
  37 + private java.lang.Integer id;
39 /** 38 /**
40 * 角色名称 39 * 角色名称
41 */ 40 */
42 @Excel(name="角色名",width=15) 41 @Excel(name="角色名",width=15)
43 private String roleName; 42 private String roleName;
44 - 43 +
45 /** 44 /**
46 * 角色编码 45 * 角色编码
47 */ 46 */
48 @Excel(name="角色编码",width=15) 47 @Excel(name="角色编码",width=15)
49 private String roleCode; 48 private String roleCode;
50 - 49 +
51 /** 50 /**
52 * 描述 51 * 描述
53 */ 52 */
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java
  View file @802cf13
@@ -30,19 +30,19 @@ public class SysRolePermission implements Serializable { @@ -30,19 +30,19 @@ public class SysRolePermission implements Serializable {
30 /** 30 /**
31 * id 31 * id
32 */ 32 */
33 - @TableId(type = IdType.ASSIGN_ID)  
34 - private String id;  
35 - 33 + @TableId(type = IdType.AUTO)
  34 + private java.lang.Integer id;
  35 +
36 /** 36 /**
37 * 角色id 37 * 角色id
38 */ 38 */
39 - private String roleId; 39 + private Integer roleId;
40 40
41 /** 41 /**
42 * 权限id 42 * 权限id
43 */ 43 */
44 - private String permissionId;  
45 - 44 + private Integer permissionId;
  45 +
46 /** 46 /**
47 * 数据权限 47 * 数据权限
48 */ 48 */
@@ -62,8 +62,8 @@ public class SysRolePermission implements Serializable { @@ -62,8 +62,8 @@ public class SysRolePermission implements Serializable {
62 62
63 public SysRolePermission() { 63 public SysRolePermission() {
64 } 64 }
65 -  
66 - public SysRolePermission(String roleId, String permissionId) { 65 +
  66 + public SysRolePermission(Integer roleId, Integer permissionId) {
67 this.roleId = roleId; 67 this.roleId = roleId;
68 this.permissionId = permissionId; 68 this.permissionId = permissionId;
69 } 69 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysTenant.java
  View file @802cf13
1 package org.jeecg.modules.system.entity; 1 package org.jeecg.modules.system.entity;
2 2
  3 +import com.baomidou.mybatisplus.annotation.IdType;
3 import com.baomidou.mybatisplus.annotation.TableId; 4 import com.baomidou.mybatisplus.annotation.TableId;
4 import com.baomidou.mybatisplus.annotation.TableName; 5 import com.baomidou.mybatisplus.annotation.TableName;
5 import com.fasterxml.jackson.annotation.JsonFormat; 6 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -19,15 +20,16 @@ public class SysTenant implements Serializable { @@ -19,15 +20,16 @@ public class SysTenant implements Serializable {
19 private static final long serialVersionUID = 1L; 20 private static final long serialVersionUID = 1L;
20 21
21 /** 22 /**
22 - * 编码 23 + * id
23 */ 24 */
24 - private Integer id;  
25 - 25 + @TableId(type = IdType.AUTO)
  26 + private java.lang.Integer id;
  27 +
26 /** 28 /**
27 * 名称 29 * 名称
28 */ 30 */
29 private String name; 31 private String name;
30 - 32 +
31 33
32 /** 34 /**
33 * 创建人 35 * 创建人
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java
  View file @802cf13
@@ -24,11 +24,12 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -24,11 +24,12 @@ import org.springframework.format.annotation.DateTimeFormat;
24 @Accessors(chain = true) 24 @Accessors(chain = true)
25 @ApiModel(value="sys_third_account对象", description="第三方登录账号表") 25 @ApiModel(value="sys_third_account对象", description="第三方登录账号表")
26 public class SysThirdAccount { 26 public class SysThirdAccount {
27 -  
28 - /**编号*/  
29 - @TableId(type = IdType.ASSIGN_ID)  
30 - @ApiModelProperty(value = "编号")  
31 - private java.lang.String id; 27 +
  28 + /**
  29 + * id
  30 + */
  31 + @TableId(type = IdType.AUTO)
  32 + private java.lang.Integer id;
32 /**第三方登录id*/ 33 /**第三方登录id*/
33 @Excel(name = "第三方登录id", width = 15) 34 @Excel(name = "第三方登录id", width = 15)
34 @ApiModelProperty(value = "第三方登录id") 35 @ApiModelProperty(value = "第三方登录id")
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java
  View file @802cf13
@@ -33,13 +33,11 @@ import lombok.experimental.Accessors; @@ -33,13 +33,11 @@ import lombok.experimental.Accessors;
33 public class SysUser implements Serializable { 33 public class SysUser implements Serializable {
34 34
35 private static final long serialVersionUID = 1L; 35 private static final long serialVersionUID = 1L;
36 -  
37 /** 36 /**
38 * id 37 * id
39 */ 38 */
40 - @TableId(type = IdType.ASSIGN_ID)  
41 - private String id;  
42 - 39 + @TableId(type = IdType.AUTO)
  40 + private java.lang.Integer id;
43 /** 41 /**
44 * 登录账号 42 * 登录账号
45 */ 43 */
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java
  View file @802cf13
@@ -20,10 +20,12 @@ import org.jeecgframework.poi.excel.annotation.Excel; @@ -20,10 +20,12 @@ import org.jeecgframework.poi.excel.annotation.Excel;
20 @TableName("sys_user_agent") 20 @TableName("sys_user_agent")
21 public class SysUserAgent implements Serializable { 21 public class SysUserAgent implements Serializable {
22 private static final long serialVersionUID = 1L; 22 private static final long serialVersionUID = 1L;
23 -  
24 - /**序号*/  
25 - @TableId(type = IdType.ASSIGN_ID)  
26 - private java.lang.String id; 23 +
  24 + /**
  25 + * id
  26 + */
  27 + @TableId(type = IdType.AUTO)
  28 + private java.lang.Integer id;
27 /**用户名*/ 29 /**用户名*/
28 @Excel(name = "用户名", width = 15) 30 @Excel(name = "用户名", width = 15)
29 private java.lang.String userName; 31 private java.lang.String userName;
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java
  View file @802cf13
@@ -11,22 +11,24 @@ import lombok.Data; @@ -11,22 +11,24 @@ import lombok.Data;
11 @TableName("sys_user_depart") 11 @TableName("sys_user_depart")
12 public class SysUserDepart implements Serializable { 12 public class SysUserDepart implements Serializable {
13 private static final long serialVersionUID = 1L; 13 private static final long serialVersionUID = 1L;
14 -  
15 - /**主键id*/  
16 - @TableId(type = IdType.ASSIGN_ID)  
17 - private String id; 14 +
  15 + /**
  16 + * id
  17 + */
  18 + @TableId(type = IdType.AUTO)
  19 + private java.lang.Integer id;
18 /**用户id*/ 20 /**用户id*/
19 - private String userId; 21 + private Integer userId;
20 /**部门id*/ 22 /**部门id*/
21 - private String depId;  
22 - public SysUserDepart(String id, String userId, String depId) { 23 + private Integer depId;
  24 + public SysUserDepart(Integer id, Integer userId, Integer depId) {
23 super(); 25 super();
24 this.id = id; 26 this.id = id;
25 this.userId = userId; 27 this.userId = userId;
26 this.depId = depId; 28 this.depId = depId;
27 } 29 }
28 30
29 - public SysUserDepart(String id, String departId) { 31 + public SysUserDepart(Integer id, Integer departId) {
30 this.userId = id; 32 this.userId = id;
31 this.depId = departId; 33 this.depId = departId;
32 } 34 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java
  View file @802cf13
@@ -24,27 +24,30 @@ public class SysUserRole implements Serializable { @@ -24,27 +24,30 @@ public class SysUserRole implements Serializable {
24 24
25 private static final long serialVersionUID = 1L; 25 private static final long serialVersionUID = 1L;
26 26
27 - @TableId(type = IdType.ASSIGN_ID)  
28 - private String id;  
29 - 27 + /**
  28 + * id
  29 + */
  30 + @TableId(type = IdType.AUTO)
  31 + private java.lang.Integer id;
  32 +
30 /** 33 /**
31 * 用户id 34 * 用户id
32 */ 35 */
33 - private String userId; 36 + private Integer userId;
34 37
35 /** 38 /**
36 * 角色id 39 * 角色id
37 */ 40 */
38 - private String roleId; 41 + private Integer roleId;
39 42
40 public SysUserRole() { 43 public SysUserRole() {
41 } 44 }
42 45
43 - public SysUserRole(String userId, String roleId) { 46 + public SysUserRole(Integer userId, Integer roleId) {
44 this.userId = userId; 47 this.userId = userId;
45 this.roleId = roleId; 48 this.roleId = roleId;
46 } 49 }
47 50
48 - 51 +
49 52
50 } 53 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml
  View file @802cf13
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <mapper namespace="org.jeecg.modules.system.mapper.SysAnnouncementMapper"> 3 <mapper namespace="org.jeecg.modules.system.mapper.SysAnnouncementMapper">
4 4
5 <resultMap id="SysAnnouncement" type="org.jeecg.modules.system.entity.SysAnnouncement" > 5 <resultMap id="SysAnnouncement" type="org.jeecg.modules.system.entity.SysAnnouncement" >
6 - <result column="id" property="id" jdbcType="VARCHAR"/> 6 + <result column="id" property="id" jdbcType="INTEGER"/>
7 <result column="titile" property="titile" jdbcType="VARCHAR"/> 7 <result column="titile" property="titile" jdbcType="VARCHAR"/>
8 <result column="msg_content" property="msgContent" jdbcType="VARCHAR"/> 8 <result column="msg_content" property="msgContent" jdbcType="VARCHAR"/>
9 <result column="start_time" property="startTime" jdbcType="TIMESTAMP"/> 9 <result column="start_time" property="startTime" jdbcType="TIMESTAMP"/>
@@ -26,15 +26,15 @@ @@ -26,15 +26,15 @@
26 <result column="open_type" property="openType" jdbcType="VARCHAR"/> 26 <result column="open_type" property="openType" jdbcType="VARCHAR"/>
27 <result column="open_page" property="openPage" jdbcType="VARCHAR"/> 27 <result column="open_page" property="openPage" jdbcType="VARCHAR"/>
28 </resultMap> 28 </resultMap>
29 -  
30 - 29 +
  30 +
31 <select id="querySysCementListByUserId" parameterType="String" resultMap="SysAnnouncement"> 31 <select id="querySysCementListByUserId" parameterType="String" resultMap="SysAnnouncement">
32 - select * from sys_announcement  
33 - where send_status = '1'  
34 - and del_flag = '0'  
35 - and msg_category = #{msgCategory} 32 + select * from sys_announcement
  33 + where send_status = '1'
  34 + and del_flag = '0'
  35 + and msg_category = #{msgCategory}
36 and id IN ( select annt_id from sys_announcement_send where user_id = #{userId} and read_flag = '0') 36 and id IN ( select annt_id from sys_announcement_send where user_id = #{userId} and read_flag = '0')
37 order by create_time DESC 37 order by create_time DESC
38 </select> 38 </select>
39 39
40 -</mapper>  
41 \ No newline at end of file 40 \ No newline at end of file
  41 +</mapper>
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
  View file @802cf13
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="org.jeecg.modules.system.mapper.SysAnnouncementSendMapper"> 3 <mapper namespace="org.jeecg.modules.system.mapper.SysAnnouncementSendMapper">
4 - 4 +
5 <resultMap id="AnnouncementSendModel" type="org.jeecg.modules.system.model.AnnouncementSendModel" > 5 <resultMap id="AnnouncementSendModel" type="org.jeecg.modules.system.model.AnnouncementSendModel" >
6 - <result column="id" property="id" jdbcType="VARCHAR"/> 6 + <result column="id" property="id" jdbcType="INTEGER"/>
7 <result column="annt_id" property="anntId" jdbcType="VARCHAR"/> 7 <result column="annt_id" property="anntId" jdbcType="VARCHAR"/>
8 <result column="user_id" property="userId" jdbcType="VARCHAR"/> 8 <result column="user_id" property="userId" jdbcType="VARCHAR"/>
9 <result column="titile" property="titile" jdbcType="VARCHAR"/> 9 <result column="titile" property="titile" jdbcType="VARCHAR"/>
@@ -16,12 +16,12 @@ @@ -16,12 +16,12 @@
16 <result column="open_type" property="openType" jdbcType="VARCHAR"/> 16 <result column="open_type" property="openType" jdbcType="VARCHAR"/>
17 <result column="open_page" property="openPage" jdbcType="VARCHAR"/> 17 <result column="open_page" property="openPage" jdbcType="VARCHAR"/>
18 </resultMap> 18 </resultMap>
19 - 19 +
20 <select id="queryByUserId" parameterType="String" resultType="String"> 20 <select id="queryByUserId" parameterType="String" resultType="String">
21 - select sas.annt_id from sys_announcement_send sas 21 + select sas.annt_id from sys_announcement_send sas
22 where sas.user_id = #{userId} 22 where sas.user_id = #{userId}
23 </select> 23 </select>
24 - 24 +
25 <select id="getMyAnnouncementSendList" parameterType="Object" resultMap="AnnouncementSendModel"> 25 <select id="getMyAnnouncementSendList" parameterType="Object" resultMap="AnnouncementSendModel">
26 select 26 select
27 sas.id, 27 sas.id,
@@ -64,4 +64,4 @@ @@ -64,4 +64,4 @@
64 order by sas.read_flag,sa.send_time desc 64 order by sas.read_flag,sa.send_time desc
65 </select> 65 </select>
66 66
67 -</mapper>  
68 \ No newline at end of file 67 \ No newline at end of file
  68 +</mapper>
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java
  View file @802cf13
@@ -17,14 +17,14 @@ import java.io.Serializable; @@ -17,14 +17,14 @@ import java.io.Serializable;
17 @Data 17 @Data
18 public class AnnouncementSendModel implements Serializable { 18 public class AnnouncementSendModel implements Serializable {
19 private static final long serialVersionUID = 1L; 19 private static final long serialVersionUID = 1L;
20 - 20 +
21 /**id*/ 21 /**id*/
22 @TableId(type = IdType.ASSIGN_ID) 22 @TableId(type = IdType.ASSIGN_ID)
23 - private java.lang.String id; 23 + private java.lang.Integer id;
24 /**通告id*/ 24 /**通告id*/
25 - private java.lang.String anntId; 25 + private java.lang.Integer anntId;
26 /**用户id*/ 26 /**用户id*/
27 - private java.lang.String userId; 27 + private java.lang.Integer userId;
28 /**标题*/ 28 /**标题*/
29 private java.lang.String titile; 29 private java.lang.String titile;
30 /**内容*/ 30 /**内容*/
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java
  View file @802cf13
@@ -10,9 +10,9 @@ import org.jeecg.modules.system.entity.SysDepart; @@ -10,9 +10,9 @@ import org.jeecg.modules.system.entity.SysDepart;
10 * <p> 10 * <p>
11 * 部门表 封装树结构的部门的名称的实体类 11 * 部门表 封装树结构的部门的名称的实体类
12 * <p> 12 * <p>
13 - * 13 + *
14 * @Author Steve 14 * @Author Steve
15 - * @Since 2019-01-22 15 + * @Since 2019-01-22
16 * 16 *
17 */ 17 */
18 public class DepartIdModel implements Serializable { 18 public class DepartIdModel implements Serializable {
@@ -27,32 +27,32 @@ public class DepartIdModel implements Serializable { @@ -27,32 +27,32 @@ public class DepartIdModel implements Serializable {
27 27
28 // 部门名称 28 // 部门名称
29 private String title; 29 private String title;
30 - 30 +
31 List<DepartIdModel> children = new ArrayList<>(); 31 List<DepartIdModel> children = new ArrayList<>();
32 - 32 +
33 /** 33 /**
34 * 将SysDepartTreeModel的部分数据放在该对象当中 34 * 将SysDepartTreeModel的部分数据放在该对象当中
35 * @param treeModel 35 * @param treeModel
36 * @return 36 * @return
37 */ 37 */
38 public DepartIdModel convert(SysDepartTreeModel treeModel) { 38 public DepartIdModel convert(SysDepartTreeModel treeModel) {
39 - this.key = treeModel.getId();  
40 - this.value = treeModel.getId(); 39 + this.key = String.valueOf(treeModel.getId());
  40 + this.value = String.valueOf(treeModel.getId());
41 this.title = treeModel.getDepartName(); 41 this.title = treeModel.getDepartName();
42 return this; 42 return this;
43 } 43 }
44 - 44 +
45 /** 45 /**
46 * 该方法为用户部门的实现类所使用 46 * 该方法为用户部门的实现类所使用
47 * @param sysDepart 47 * @param sysDepart
48 * @return 48 * @return
49 */ 49 */
50 public DepartIdModel convertByUserDepart(SysDepart sysDepart) { 50 public DepartIdModel convertByUserDepart(SysDepart sysDepart) {
51 - this.key = sysDepart.getId();  
52 - this.value = sysDepart.getId(); 51 + this.key = sysDepart.getId().toString();
  52 + this.value = sysDepart.getId().toString();
53 this.title = sysDepart.getDepartName(); 53 this.title = sysDepart.getDepartName();
54 return this; 54 return this;
55 - } 55 + }
56 56
57 public List<DepartIdModel> getChildren() { 57 public List<DepartIdModel> getChildren() {
58 return children; 58 return children;
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
  View file @802cf13
@@ -12,14 +12,14 @@ import java.util.Objects; @@ -12,14 +12,14 @@ import java.util.Objects;
12 * <p> 12 * <p>
13 * 部门表 存储树结构数据的实体类 13 * 部门表 存储树结构数据的实体类
14 * <p> 14 * <p>
15 - * 15 + *
16 * @Author Steve 16 * @Author Steve
17 - * @Since 2019-01-22 17 + * @Since 2019-01-22
18 */ 18 */
19 public class SysDepartTreeModel implements Serializable{ 19 public class SysDepartTreeModel implements Serializable{
20 - 20 +
21 private static final long serialVersionUID = 1L; 21 private static final long serialVersionUID = 1L;
22 - 22 +
23 /** 对应SysDepart中的id字段,前端数据树中的key*/ 23 /** 对应SysDepart中的id字段,前端数据树中的key*/
24 private String key; 24 private String key;
25 25
@@ -32,10 +32,10 @@ public class SysDepartTreeModel implements Serializable{ @@ -32,10 +32,10 @@ public class SysDepartTreeModel implements Serializable{
32 32
33 private boolean isLeaf; 33 private boolean isLeaf;
34 // 以下所有字段均与SysDepart相同 34 // 以下所有字段均与SysDepart相同
35 -  
36 - private String id;  
37 35
38 - private String parentId; 36 + private Integer id;
  37 +
  38 + private Integer parentId;
39 39
40 private String departName; 40 private String departName;
41 41
@@ -46,7 +46,7 @@ public class SysDepartTreeModel implements Serializable{ @@ -46,7 +46,7 @@ public class SysDepartTreeModel implements Serializable{
46 private Integer departOrder; 46 private Integer departOrder;
47 47
48 private String description; 48 private String description;
49 - 49 +
50 private String orgCategory; 50 private String orgCategory;
51 51
52 private String orgType; 52 private String orgType;
@@ -83,8 +83,8 @@ public class SysDepartTreeModel implements Serializable{ @@ -83,8 +83,8 @@ public class SysDepartTreeModel implements Serializable{
83 * @param sysDepart 83 * @param sysDepart
84 */ 84 */
85 public SysDepartTreeModel(SysDepart sysDepart) { 85 public SysDepartTreeModel(SysDepart sysDepart) {
86 - this.key = sysDepart.getId();  
87 - this.value = sysDepart.getId(); 86 + this.key = sysDepart.getId().toString();
  87 + this.value = sysDepart.getId().toString();
88 this.title = sysDepart.getDepartName(); 88 this.title = sysDepart.getDepartName();
89 this.id = sysDepart.getId(); 89 this.id = sysDepart.getId();
90 this.parentId = sysDepart.getParentId(); 90 this.parentId = sysDepart.getParentId();
@@ -147,12 +147,12 @@ public class SysDepartTreeModel implements Serializable{ @@ -147,12 +147,12 @@ public class SysDepartTreeModel implements Serializable{
147 } 147 }
148 148
149 149
150 - public String getId() { 150 + public Integer getId() {
151 return id; 151 return id;
152 } 152 }
153 153
154 public void setId(String id) { 154 public void setId(String id) {
155 - this.id = id; 155 + this.id = Integer.valueOf(id);
156 } 156 }
157 157
158 public List<SysDepartTreeModel> getChildren() { 158 public List<SysDepartTreeModel> getChildren() {
@@ -166,11 +166,11 @@ public class SysDepartTreeModel implements Serializable{ @@ -166,11 +166,11 @@ public class SysDepartTreeModel implements Serializable{
166 this.children = children; 166 this.children = children;
167 } 167 }
168 168
169 - public String getParentId() { 169 + public Integer getParentId() {
170 return parentId; 170 return parentId;
171 } 171 }
172 172
173 - public void setParentId(String parentId) { 173 + public void setParentId(Integer parentId) {
174 this.parentId = parentId; 174 this.parentId = parentId;
175 } 175 }
176 176
@@ -185,7 +185,7 @@ public class SysDepartTreeModel implements Serializable{ @@ -185,7 +185,7 @@ public class SysDepartTreeModel implements Serializable{
185 public void setDepartName(String departName) { 185 public void setDepartName(String departName) {
186 this.departName = departName; 186 this.departName = departName;
187 } 187 }
188 - 188 +
189 public String getOrgCategory() { 189 public String getOrgCategory() {
190 return orgCategory; 190 return orgCategory;
191 } 191 }
@@ -367,7 +367,7 @@ public class SysDepartTreeModel implements Serializable{ @@ -367,7 +367,7 @@ public class SysDepartTreeModel implements Serializable{
367 Objects.equals(updateTime, model.updateTime) && 367 Objects.equals(updateTime, model.updateTime) &&
368 Objects.equals(children, model.children); 368 Objects.equals(children, model.children);
369 } 369 }
370 - 370 +
371 /** 371 /**
372 * 重写hashCode方法 372 * 重写hashCode方法
373 */ 373 */
@@ -375,7 +375,7 @@ public class SysDepartTreeModel implements Serializable{ @@ -375,7 +375,7 @@ public class SysDepartTreeModel implements Serializable{
375 public int hashCode() { 375 public int hashCode() {
376 376
377 return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr, 377 return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr,
378 - departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address, 378 + departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address,
379 memo, status, delFlag, qywxIdentifier, createBy, createTime, updateBy, updateTime, 379 memo, status, delFlag, qywxIdentifier, createBy, createTime, updateBy, updateTime,
380 children); 380 children);
381 } 381 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDictTree.java
  View file @802cf13
@@ -28,9 +28,9 @@ public class SysDictTree implements Serializable { @@ -28,9 +28,9 @@ public class SysDictTree implements Serializable {
28 private static final long serialVersionUID = 1L; 28 private static final long serialVersionUID = 1L;
29 29
30 private String key; 30 private String key;
31 - 31 +
32 private String title; 32 private String title;
33 - 33 +
34 /** 34 /**
35 * id 35 * id
36 */ 36 */
@@ -42,7 +42,7 @@ public class SysDictTree implements Serializable { @@ -42,7 +42,7 @@ public class SysDictTree implements Serializable {
42 * 默认为string类型 42 * 默认为string类型
43 */ 43 */
44 private Integer type; 44 private Integer type;
45 - 45 +
46 /** 46 /**
47 * 字典名称 47 * 字典名称
48 */ 48 */
@@ -82,15 +82,15 @@ public class SysDictTree implements Serializable { @@ -82,15 +82,15 @@ public class SysDictTree implements Serializable {
82 * 更新时间 82 * 更新时间
83 */ 83 */
84 private Date updateTime; 84 private Date updateTime;
85 - 85 +
86 public SysDictTree(SysDict node) { 86 public SysDictTree(SysDict node) {
87 - this.id = node.getId();  
88 - this.key = node.getId(); 87 + this.id = node.getId().toString();
  88 + this.key = node.getId().toString();
89 this.title = node.getDictName(); 89 this.title = node.getDictName();
90 this.dictCode = node.getDictCode(); 90 this.dictCode = node.getDictCode();
91 this.description = node.getDescription(); 91 this.description = node.getDescription();
92 this.delFlag = node.getDelFlag(); 92 this.delFlag = node.getDelFlag();
93 this.type = node.getType(); 93 this.type = node.getType();
94 } 94 }
95 - 95 +
96 } 96 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java
  View file @802cf13
@@ -51,7 +51,7 @@ public class SysPermissionTree implements Serializable { @@ -51,7 +51,7 @@ public class SysPermissionTree implements Serializable {
51 * 跳转网页链接 51 * 跳转网页链接
52 */ 52 */
53 private String url; 53 private String url;
54 - 54 +
55 /** 55 /**
56 * 一级菜单跳转地址 56 * 一级菜单跳转地址
57 */ 57 */
@@ -71,7 +71,7 @@ public class SysPermissionTree implements Serializable { @@ -71,7 +71,7 @@ public class SysPermissionTree implements Serializable {
71 * 是否叶子节点: 1:是 0:不是 71 * 是否叶子节点: 1:是 0:不是
72 */ 72 */
73 private boolean isLeaf; 73 private boolean isLeaf;
74 - 74 +
75 /** 75 /**
76 * 是否路由菜单: 0:不是 1:是（默认值1） 76 * 是否路由菜单: 0:不是 1:是（默认值1）
77 */ 77 */
@@ -118,7 +118,7 @@ public class SysPermissionTree implements Serializable { @@ -118,7 +118,7 @@ public class SysPermissionTree implements Serializable {
118 private boolean alwaysShow; 118 private boolean alwaysShow;
119 /**是否隐藏路由菜单: 0否,1是（默认值0）*/ 119 /**是否隐藏路由菜单: 0否,1是（默认值0）*/
120 private boolean hidden; 120 private boolean hidden;
121 - 121 +
122 /**按钮权限状态(0无效1有效)*/ 122 /**按钮权限状态(0无效1有效)*/
123 private java.lang.String status; 123 private java.lang.String status;
124 124
@@ -132,8 +132,8 @@ public class SysPermissionTree implements Serializable { @@ -132,8 +132,8 @@ public class SysPermissionTree implements Serializable {
132 } 132 }
133 133
134 public SysPermissionTree(SysPermission permission) { 134 public SysPermissionTree(SysPermission permission) {
135 - this.key = permission.getId();  
136 - this.id = permission.getId(); 135 + this.key = permission.getId().toString();
  136 + this.id = permission.getId().toString();
137 this.perms = permission.getPerms(); 137 this.perms = permission.getPerms();
138 this.permsType = permission.getPermsType(); 138 this.permsType = permission.getPermsType();
139 this.component = permission.getComponent(); 139 this.component = permission.getComponent();
@@ -145,7 +145,7 @@ public class SysPermissionTree implements Serializable { @@ -145,7 +145,7 @@ public class SysPermissionTree implements Serializable {
145 this.isLeaf = permission.isLeaf(); 145 this.isLeaf = permission.isLeaf();
146 this.menuType = permission.getMenuType(); 146 this.menuType = permission.getMenuType();
147 this.name = permission.getName(); 147 this.name = permission.getName();
148 - this.parentId = permission.getParentId(); 148 + this.parentId = String.valueOf(permission.getParentId());
149 this.sortNo = permission.getSortNo(); 149 this.sortNo = permission.getSortNo();
150 this.updateBy = permission.getUpdateBy(); 150 this.updateBy = permission.getUpdateBy();
151 this.updateTime = permission.getUpdateTime(); 151 this.updateTime = permission.getUpdateTime();
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeModel.java
  View file @802cf13
@@ -12,23 +12,23 @@ import org.jeecg.modules.system.entity.SysPermission; @@ -12,23 +12,23 @@ import org.jeecg.modules.system.entity.SysPermission;
12 * 树形列表用到 12 * 树形列表用到
13 */ 13 */
14 public class TreeModel implements Serializable { 14 public class TreeModel implements Serializable {
15 - 15 +
16 private static final long serialVersionUID = 4013193970046502756L; 16 private static final long serialVersionUID = 4013193970046502756L;
17 17
18 private String key; 18 private String key;
19 - 19 +
20 private String title; 20 private String title;
21 - 21 +
22 private String slotTitle; 22 private String slotTitle;
23 - 23 +
24 private boolean isLeaf; 24 private boolean isLeaf;
25 - 25 +
26 private String icon; 26 private String icon;
27 - 27 +
28 private Integer ruleFlag; 28 private Integer ruleFlag;
29 - 29 +
30 private Map<String,String> scopedSlots; 30 private Map<String,String> scopedSlots;
31 - 31 +
32 public Map<String, String> getScopedSlots() { 32 public Map<String, String> getScopedSlots() {
33 return scopedSlots; 33 return scopedSlots;
34 } 34 }
@@ -68,7 +68,7 @@ public class TreeModel implements Serializable { @@ -68,7 +68,7 @@ public class TreeModel implements Serializable {
68 public void setIcon(String icon) { 68 public void setIcon(String icon) {
69 this.icon = icon; 69 this.icon = icon;
70 } 70 }
71 - 71 +
72 private List<TreeModel> children; 72 private List<TreeModel> children;
73 73
74 public List<TreeModel> getChildren() { 74 public List<TreeModel> getChildren() {
@@ -80,23 +80,23 @@ public class TreeModel implements Serializable { @@ -80,23 +80,23 @@ public class TreeModel implements Serializable {
80 } 80 }
81 81
82 public TreeModel() { 82 public TreeModel() {
83 - 83 +
84 } 84 }
85 - 85 +
86 public TreeModel(SysPermission permission) { 86 public TreeModel(SysPermission permission) {
87 - this.key = permission.getId(); 87 + this.key = permission.getId().toString();
88 this.icon = permission.getIcon(); 88 this.icon = permission.getIcon();
89 - this.parentId = permission.getParentId(); 89 + this.parentId = String.valueOf(permission.getParentId());
90 this.title = permission.getName(); 90 this.title = permission.getName();
91 this.slotTitle = permission.getName(); 91 this.slotTitle = permission.getName();
92 - this.value = permission.getId(); 92 + this.value = permission.getId().toString();
93 this.isLeaf = permission.isLeaf(); 93 this.isLeaf = permission.isLeaf();
94 this.label = permission.getName(); 94 this.label = permission.getName();
95 if(!permission.isLeaf()) { 95 if(!permission.isLeaf()) {
96 this.children = new ArrayList<TreeModel>(); 96 this.children = new ArrayList<TreeModel>();
97 } 97 }
98 } 98 }
99 - 99 +
100 public TreeModel(String key,String parentId,String slotTitle,Integer ruleFlag,boolean isLeaf) { 100 public TreeModel(String key,String parentId,String slotTitle,Integer ruleFlag,boolean isLeaf) {
101 this.key = key; 101 this.key = key;
102 this.parentId = parentId; 102 this.parentId = parentId;
@@ -111,14 +111,14 @@ public class TreeModel implements Serializable { @@ -111,14 +111,14 @@ public class TreeModel implements Serializable {
111 this.children = new ArrayList<TreeModel>(); 111 this.children = new ArrayList<TreeModel>();
112 } 112 }
113 } 113 }
114 - 114 +
115 private String parentId; 115 private String parentId;
116 - 116 +
117 private String label; 117 private String label;
118 - 118 +
119 private String value; 119 private String value;
120 -  
121 - 120 +
  121 +
122 public String getParentId() { 122 public String getParentId() {
123 return parentId; 123 return parentId;
124 } 124 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
  View file @802cf13
@@ -32,10 +32,10 @@ public class SysAnnouncementServiceImpl extends ServiceImpl&lt;SysAnnouncementMappe @@ -32,10 +32,10 @@ public class SysAnnouncementServiceImpl extends ServiceImpl&lt;SysAnnouncementMappe
32 32
33 @Resource 33 @Resource
34 private SysAnnouncementMapper sysAnnouncementMapper; 34 private SysAnnouncementMapper sysAnnouncementMapper;
35 - 35 +
36 @Resource 36 @Resource
37 private SysAnnouncementSendMapper sysAnnouncementSendMapper; 37 private SysAnnouncementSendMapper sysAnnouncementSendMapper;
38 - 38 +
39 @Transactional 39 @Transactional
40 @Override 40 @Override
41 public void saveAnnouncement(SysAnnouncement sysAnnouncement) { 41 public void saveAnnouncement(SysAnnouncement sysAnnouncement) {
@@ -47,19 +47,19 @@ public class SysAnnouncementServiceImpl extends ServiceImpl&lt;SysAnnouncementMappe @@ -47,19 +47,19 @@ public class SysAnnouncementServiceImpl extends ServiceImpl&lt;SysAnnouncementMappe
47 // 2.插入用户通告阅读标记表记录 47 // 2.插入用户通告阅读标记表记录
48 String userId = sysAnnouncement.getUserIds(); 48 String userId = sysAnnouncement.getUserIds();
49 String[] userIds = userId.substring(0, (userId.length()-1)).split(","); 49 String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
50 - String anntId = sysAnnouncement.getId(); 50 + Integer anntId = sysAnnouncement.getId();
51 Date refDate = new Date(); 51 Date refDate = new Date();
52 for(int i=0;i<userIds.length;i++) { 52 for(int i=0;i<userIds.length;i++) {
53 SysAnnouncementSend announcementSend = new SysAnnouncementSend(); 53 SysAnnouncementSend announcementSend = new SysAnnouncementSend();
54 announcementSend.setAnntId(anntId); 54 announcementSend.setAnntId(anntId);
55 - announcementSend.setUserId(userIds[i]); 55 + announcementSend.setUserId(Integer.valueOf(userIds[i]));
56 announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG); 56 announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
57 announcementSend.setReadTime(refDate); 57 announcementSend.setReadTime(refDate);
58 sysAnnouncementSendMapper.insert(announcementSend); 58 sysAnnouncementSendMapper.insert(announcementSend);
59 } 59 }
60 } 60 }
61 } 61 }
62 - 62 +
63 /** 63 /**
64 * @功能：编辑消息信息 64 * @功能：编辑消息信息
65 */ 65 */
@@ -72,7 +72,7 @@ public class SysAnnouncementServiceImpl extends ServiceImpl&lt;SysAnnouncementMappe @@ -72,7 +72,7 @@ public class SysAnnouncementServiceImpl extends ServiceImpl&lt;SysAnnouncementMappe
72 if(oConvertUtils.isNotEmpty(userId)&&sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_UESR)) { 72 if(oConvertUtils.isNotEmpty(userId)&&sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_UESR)) {
73 // 2.补充新的通知用户数据 73 // 2.补充新的通知用户数据
74 String[] userIds = userId.substring(0, (userId.length()-1)).split(","); 74 String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
75 - String anntId = sysAnnouncement.getId(); 75 + Integer anntId = sysAnnouncement.getId();
76 Date refDate = new Date(); 76 Date refDate = new Date();
77 for(int i=0;i<userIds.length;i++) { 77 for(int i=0;i<userIds.length;i++) {
78 LambdaQueryWrapper<SysAnnouncementSend> queryWrapper = new LambdaQueryWrapper<SysAnnouncementSend>(); 78 LambdaQueryWrapper<SysAnnouncementSend> queryWrapper = new LambdaQueryWrapper<SysAnnouncementSend>();
@@ -82,7 +82,7 @@ public class SysAnnouncementServiceImpl extends ServiceImpl&lt;SysAnnouncementMappe @@ -82,7 +82,7 @@ public class SysAnnouncementServiceImpl extends ServiceImpl&lt;SysAnnouncementMappe
82 if(announcementSends.size()<=0) { 82 if(announcementSends.size()<=0) {
83 SysAnnouncementSend announcementSend = new SysAnnouncementSend(); 83 SysAnnouncementSend announcementSend = new SysAnnouncementSend();
84 announcementSend.setAnntId(anntId); 84 announcementSend.setAnntId(anntId);
85 - announcementSend.setUserId(userIds[i]); 85 + announcementSend.setUserId(Integer.valueOf(userIds[i]));
86 announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG); 86 announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
87 announcementSend.setReadTime(refDate); 87 announcementSend.setReadTime(refDate);
88 sysAnnouncementSendMapper.insert(announcementSend); 88 sysAnnouncementSendMapper.insert(announcementSend);
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
  View file @802cf13
@@ -50,7 +50,7 @@ import java.util.*; @@ -50,7 +50,7 @@ import java.util.*;
50 /** 50 /**
51 * @Description: 底层共通业务API，提供其他独立模块调用 51 * @Description: 底层共通业务API，提供其他独立模块调用
52 * @Author: scott 52 * @Author: scott
53 - * @Date:2019-4-20 53 + * @Date:2019-4-20
54 * @Version:V1.0 54 * @Version:V1.0
55 */ 55 */
56 @Slf4j 56 @Slf4j
@@ -168,7 +168,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -168,7 +168,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
168 List<SysPermissionDataRuleModel> dataRules = new ArrayList<SysPermissionDataRuleModel>(); 168 List<SysPermissionDataRuleModel> dataRules = new ArrayList<SysPermissionDataRuleModel>();
169 for (SysPermission sysPermission : currentSyspermission) { 169 for (SysPermission sysPermission : currentSyspermission) {
170 // update-begin--Author:scott Date:20191119 for：数据权限规则编码不规范，项目存在相同包名和类名 #722 170 // update-begin--Author:scott Date:20191119 for：数据权限规则编码不规范，项目存在相同包名和类名 #722
171 - List<SysPermissionDataRule> temp = sysPermissionDataRuleService.queryPermissionDataRules(username, sysPermission.getId()); 171 + List<SysPermissionDataRule> temp = sysPermissionDataRuleService.queryPermissionDataRules(username, sysPermission.getId().toString());
172 if(temp!=null && temp.size()>0) { 172 if(temp!=null && temp.size()>0) {
173 //dataRules.addAll(temp); 173 //dataRules.addAll(temp);
174 dataRules = oConvertUtils.entityListToModelList(temp,SysPermissionDataRuleModel.class); 174 dataRules = oConvertUtils.entityListToModelList(temp,SysPermissionDataRuleModel.class);
@@ -212,7 +212,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -212,7 +212,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
212 return null; 212 return null;
213 } 213 }
214 //多部门支持in查询 214 //多部门支持in查询
215 - List<SysDepart> list = departMapper.queryUserDeparts(user.getId()); 215 + List<SysDepart> list = departMapper.queryUserDeparts(user.getId().toString());
216 List<String> sysMultiOrgCode = new ArrayList<String>(); 216 List<String> sysMultiOrgCode = new ArrayList<String>();
217 if(list==null || list.size()==0) { 217 if(list==null || list.size()==0) {
218 //当前用户无部门 218 //当前用户无部门
@@ -253,7 +253,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -253,7 +253,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
253 List<SysDepart> list = sysDepartService.queryDepartsByUsername(username); 253 List<SysDepart> list = sysDepartService.queryDepartsByUsername(username);
254 List<String> result = new ArrayList<>(list.size()); 254 List<String> result = new ArrayList<>(list.size());
255 for (SysDepart depart : list) { 255 for (SysDepart depart : list) {
256 - result.add(depart.getId()); 256 + result.add(depart.getId().toString());
257 } 257 }
258 return result; 258 return result;
259 } 259 }
@@ -271,7 +271,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -271,7 +271,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
271 @Override 271 @Override
272 public DictModel getParentDepartId(String departId) { 272 public DictModel getParentDepartId(String departId) {
273 SysDepart depart = departMapper.getParentDepartId(departId); 273 SysDepart depart = departMapper.getParentDepartId(departId);
274 - DictModel model = new DictModel(depart.getId(),depart.getParentId()); 274 + DictModel model = new DictModel(depart.getId().toString(),depart.getParentId().toString());
275 return model; 275 return model;
276 } 276 }
277 277
@@ -377,7 +377,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -377,7 +377,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
377 // 2.插入用户通告阅读标记表记录 377 // 2.插入用户通告阅读标记表记录
378 String userId = toUser; 378 String userId = toUser;
379 String[] userIds = userId.split(","); 379 String[] userIds = userId.split(",");
380 - String anntId = announcement.getId(); 380 + Integer anntId = announcement.getId();
381 for(int i=0;i<userIds.length;i++) { 381 for(int i=0;i<userIds.length;i++) {
382 if(oConvertUtils.isNotEmpty(userIds[i])) { 382 if(oConvertUtils.isNotEmpty(userIds[i])) {
383 SysUser sysUser = userMapper.getUserByName(userIds[i]); 383 SysUser sysUser = userMapper.getUserByName(userIds[i]);
@@ -394,7 +394,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -394,7 +394,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
394 obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId()); 394 obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId());
395 obj.put(WebsocketConst.MSG_ID, announcement.getId()); 395 obj.put(WebsocketConst.MSG_ID, announcement.getId());
396 obj.put(WebsocketConst.MSG_TXT, announcement.getTitile()); 396 obj.put(WebsocketConst.MSG_TXT, announcement.getTitile());
397 - webSocket.sendMessage(sysUser.getId(), obj.toJSONString()); 397 + webSocket.sendMessage(sysUser.getId().toString(), obj.toJSONString());
398 } 398 }
399 } 399 }
400 try { 400 try {
@@ -451,7 +451,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -451,7 +451,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
451 // 2.插入用户通告阅读标记表记录 451 // 2.插入用户通告阅读标记表记录
452 String userId = toUser; 452 String userId = toUser;
453 String[] userIds = userId.split(","); 453 String[] userIds = userId.split(",");
454 - String anntId = announcement.getId(); 454 + Integer anntId = announcement.getId();
455 for(int i=0;i<userIds.length;i++) { 455 for(int i=0;i<userIds.length;i++) {
456 if(oConvertUtils.isNotEmpty(userIds[i])) { 456 if(oConvertUtils.isNotEmpty(userIds[i])) {
457 SysUser sysUser = userMapper.getUserByName(userIds[i]); 457 SysUser sysUser = userMapper.getUserByName(userIds[i]);
@@ -468,7 +468,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -468,7 +468,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
468 obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId()); 468 obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId());
469 obj.put(WebsocketConst.MSG_ID, announcement.getId()); 469 obj.put(WebsocketConst.MSG_ID, announcement.getId());
470 obj.put(WebsocketConst.MSG_TXT, announcement.getTitile()); 470 obj.put(WebsocketConst.MSG_TXT, announcement.getTitile());
471 - webSocket.sendMessage(sysUser.getId(), obj.toJSONString()); 471 + webSocket.sendMessage(sysUser.getId().toString(), obj.toJSONString());
472 } 472 }
473 } 473 }
474 try { 474 try {
@@ -506,7 +506,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -506,7 +506,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
506 SysAnnouncement announcement = sysAnnouncementMapper.selectOne(new QueryWrapper<SysAnnouncement>().eq("bus_type",busType).eq("bus_id",busId)); 506 SysAnnouncement announcement = sysAnnouncementMapper.selectOne(new QueryWrapper<SysAnnouncement>().eq("bus_type",busType).eq("bus_id",busId));
507 if(announcement != null){ 507 if(announcement != null){
508 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); 508 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
509 - String userId = sysUser.getId(); 509 + String userId = sysUser.getId().toString();
510 LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda(); 510 LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
511 updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG); 511 updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
512 updateWrapper.set(SysAnnouncementSend::getReadTime, new Date()); 512 updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
@@ -591,7 +591,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -591,7 +591,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
591 for(SysUser user : userList){ 591 for(SysUser user : userList){
592 ComboModel model = new ComboModel(); 592 ComboModel model = new ComboModel();
593 model.setTitle(user.getRealname()); 593 model.setTitle(user.getRealname());
594 - model.setId(user.getId()); 594 + model.setId(user.getId().toString());
595 model.setUsername(user.getUsername()); 595 model.setUsername(user.getUsername());
596 list.add(model); 596 list.add(model);
597 } 597 }
@@ -609,7 +609,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -609,7 +609,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
609 ComboModel model = new ComboModel(); 609 ComboModel model = new ComboModel();
610 model.setUsername(user.getUsername()); 610 model.setUsername(user.getUsername());
611 model.setTitle(user.getRealname()); 611 model.setTitle(user.getRealname());
612 - model.setId(user.getId()); 612 + model.setId(user.getId().toString());
613 model.setEmail(user.getEmail()); 613 model.setEmail(user.getEmail());
614 if(oConvertUtils.isNotEmpty(userIds)){ 614 if(oConvertUtils.isNotEmpty(userIds)){
615 String[] temp = userIds.split(","); 615 String[] temp = userIds.split(",");
@@ -633,7 +633,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -633,7 +633,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
633 for(SysRole role : roleList){ 633 for(SysRole role : roleList){
634 ComboModel model = new ComboModel(); 634 ComboModel model = new ComboModel();
635 model.setTitle(role.getRoleName()); 635 model.setTitle(role.getRoleName());
636 - model.setId(role.getId()); 636 + model.setId(role.getId().toString());
637 list.add(model); 637 list.add(model);
638 } 638 }
639 return list; 639 return list;
@@ -646,7 +646,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -646,7 +646,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
646 for(SysRole role : roleList){ 646 for(SysRole role : roleList){
647 ComboModel model = new ComboModel(); 647 ComboModel model = new ComboModel();
648 model.setTitle(role.getRoleName()); 648 model.setTitle(role.getRoleName());
649 - model.setId(role.getId()); 649 + model.setId(role.getId().toString());
650 model.setRoleCode(role.getRoleCode()); 650 model.setRoleCode(role.getRoleCode());
651 if(oConvertUtils.isNotEmpty(roleIds)) { 651 if(oConvertUtils.isNotEmpty(roleIds)) {
652 for (int i = 0; i < roleIds.length; i++) { 652 for (int i = 0; i < roleIds.length; i++) {
@@ -794,8 +794,8 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -794,8 +794,8 @@ public class SysBaseApiImpl implements ISysBaseAPI {
794 List<String> listIds = departMapper.getSubDepIdsByOrgCodes(orgCodes.split(",")); 794 List<String> listIds = departMapper.getSubDepIdsByOrgCodes(orgCodes.split(","));
795 List<SysUserDepart> userList = sysUserDepartService.list(new QueryWrapper<SysUserDepart>().in("dep_id",listIds)); 795 List<SysUserDepart> userList = sysUserDepartService.list(new QueryWrapper<SysUserDepart>().in("dep_id",listIds));
796 for(SysUserDepart userDepart : userList){ 796 for(SysUserDepart userDepart : userList){
797 - if(!userIds.contains(userDepart.getUserId())){  
798 - userIds.add(userDepart.getUserId()); 797 + if(!userIds.contains(userDepart.getUserId().toString())){
  798 + userIds.add(userDepart.getUserId().toString());
799 } 799 }
800 } 800 }
801 } 801 }
@@ -954,7 +954,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -954,7 +954,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
954 // 2.插入用户通告阅读标记表记录 954 // 2.插入用户通告阅读标记表记录
955 String userId = toUser; 955 String userId = toUser;
956 String[] userIds = userId.split(","); 956 String[] userIds = userId.split(",");
957 - String anntId = announcement.getId(); 957 + Integer anntId = announcement.getId();
958 for(int i=0;i<userIds.length;i++) { 958 for(int i=0;i<userIds.length;i++) {
959 if(oConvertUtils.isNotEmpty(userIds[i])) { 959 if(oConvertUtils.isNotEmpty(userIds[i])) {
960 SysUser sysUser = userMapper.getUserByName(userIds[i]); 960 SysUser sysUser = userMapper.getUserByName(userIds[i]);
@@ -971,7 +971,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -971,7 +971,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
971 obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId()); 971 obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId());
972 obj.put(WebsocketConst.MSG_ID, announcement.getId()); 972 obj.put(WebsocketConst.MSG_ID, announcement.getId());
973 obj.put(WebsocketConst.MSG_TXT, announcement.getTitile()); 973 obj.put(WebsocketConst.MSG_TXT, announcement.getTitile());
974 - webSocket.sendMessage(sysUser.getId(), obj.toJSONString()); 974 + webSocket.sendMessage(sysUser.getId().toString(), obj.toJSONString());
975 } 975 }
976 } 976 }
977 977
@@ -1006,7 +1006,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -1006,7 +1006,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
1006 // 2.插入用户通告阅读标记表记录 1006 // 2.插入用户通告阅读标记表记录
1007 String userId = toUser; 1007 String userId = toUser;
1008 String[] userIds = userId.split(","); 1008 String[] userIds = userId.split(",");
1009 - String anntId = announcement.getId(); 1009 + Integer anntId = announcement.getId();
1010 for(int i=0;i<userIds.length;i++) { 1010 for(int i=0;i<userIds.length;i++) {
1011 if(oConvertUtils.isNotEmpty(userIds[i])) { 1011 if(oConvertUtils.isNotEmpty(userIds[i])) {
1012 SysUser sysUser = userMapper.getUserByName(userIds[i]); 1012 SysUser sysUser = userMapper.getUserByName(userIds[i]);
@@ -1023,7 +1023,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -1023,7 +1023,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
1023 obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId()); 1023 obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId());
1024 obj.put(WebsocketConst.MSG_ID, announcement.getId()); 1024 obj.put(WebsocketConst.MSG_ID, announcement.getId());
1025 obj.put(WebsocketConst.MSG_TXT, announcement.getTitile()); 1025 obj.put(WebsocketConst.MSG_TXT, announcement.getTitile());
1026 - webSocket.sendMessage(sysUser.getId(), obj.toJSONString()); 1026 + webSocket.sendMessage(sysUser.getId().toString(), obj.toJSONString());
1027 } 1027 }
1028 } 1028 }
1029 } 1029 }
@@ -1051,7 +1051,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -1051,7 +1051,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
1051 SysDepart comp=sysDepartService.queryCompByOrgCode(orgCode); 1051 SysDepart comp=sysDepartService.queryCompByOrgCode(orgCode);
1052 if(comp!=null){ 1052 if(comp!=null){
1053 //2.获取公司下级部门 1053 //2.获取公司下级部门
1054 - List<SysDepart> departs=sysDepartService.queryDeptByPid(comp.getId()); 1054 + List<SysDepart> departs=sysDepartService.queryDeptByPid(comp.getId().toString());
1055 //3.获取部门下的人员信息 1055 //3.获取部门下的人员信息
1056 List<Map> list=new ArrayList(); 1056 List<Map> list=new ArrayList();
1057 //4.处理部门和下级用户数据 1057 //4.处理部门和下级用户数据
@@ -1060,13 +1060,13 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -1060,13 +1060,13 @@ public class SysBaseApiImpl implements ISysBaseAPI {
1060 //部门名称 1060 //部门名称
1061 String departName = dept.getDepartName(); 1061 String departName = dept.getDepartName();
1062 //根据部门编码获取下级部门id 1062 //根据部门编码获取下级部门id
1063 - List<String> listIds = departMapper.getSubDepIdsByDepId(dept.getId()); 1063 + List<String> listIds = departMapper.getSubDepIdsByDepId(dept.getId().toString());
1064 //根据下级部门ids获取下级部门的所有用户 1064 //根据下级部门ids获取下级部门的所有用户
1065 List<SysUserDepart> userList = sysUserDepartService.list(new QueryWrapper<SysUserDepart>().in("dep_id",listIds)); 1065 List<SysUserDepart> userList = sysUserDepartService.list(new QueryWrapper<SysUserDepart>().in("dep_id",listIds));
1066 List<String> userIds = new ArrayList<>(); 1066 List<String> userIds = new ArrayList<>();
1067 for(SysUserDepart userDepart : userList){ 1067 for(SysUserDepart userDepart : userList){
1068 - if(!userIds.contains(userDepart.getUserId())){  
1069 - userIds.add(userDepart.getUserId()); 1068 + if(!userIds.contains(userDepart.getUserId().toString())){
  1069 + userIds.add(userDepart.getUserId().toString());
1070 } 1070 }
1071 } 1071 }
1072 map.put("name",departName); 1072 map.put("name",departName);
@@ -1154,4 +1154,4 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -1154,4 +1154,4 @@ public class SysBaseApiImpl implements ISysBaseAPI {
1154 return sysDictService.queryTableDictTextByKeys(table, text, code, Arrays.asList(keys.split(","))); 1154 return sysDictService.queryTableDictTextByKeys(table, text, code, Arrays.asList(keys.split(",")));
1155 } 1155 }
1156 1156
1157 -}  
1158 \ No newline at end of file 1157 \ No newline at end of file
  1158 +}
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java
  View file @802cf13
@@ -58,7 +58,7 @@ public class SysCategoryServiceImpl extends ServiceImpl&lt;SysCategoryMapper, SysCa @@ -58,7 +58,7 @@ public class SysCategoryServiceImpl extends ServiceImpl&lt;SysCategoryMapper, SysCa
58 sysCategory.setPid(categoryPid); 58 sysCategory.setPid(categoryPid);
59 baseMapper.insert(sysCategory); 59 baseMapper.insert(sysCategory);
60 } 60 }
61 - 61 +
62 @Override 62 @Override
63 public void updateSysCategory(SysCategory sysCategory) { 63 public void updateSysCategory(SysCategory sysCategory) {
64 if(oConvertUtils.isEmpty(sysCategory.getPid())){ 64 if(oConvertUtils.isEmpty(sysCategory.getPid())){
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java
  View file @802cf13
@@ -46,7 +46,7 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl&lt;SysDepartPermiss @@ -46,7 +46,7 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl&lt;SysDepartPermiss
46 List<SysDepartPermission> list = new ArrayList<SysDepartPermission>(); 46 List<SysDepartPermission> list = new ArrayList<SysDepartPermission>();
47 for (String p : add) { 47 for (String p : add) {
48 if(oConvertUtils.isNotEmpty(p)) { 48 if(oConvertUtils.isNotEmpty(p)) {
49 - SysDepartPermission rolepms = new SysDepartPermission(departId, p); 49 + SysDepartPermission rolepms = new SysDepartPermission(Integer.valueOf(departId), Integer.valueOf(p));
50 list.add(rolepms); 50 list.add(rolepms);
51 } 51 }
52 } 52 }
@@ -58,7 +58,7 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl&lt;SysDepartPermiss @@ -58,7 +58,7 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl&lt;SysDepartPermiss
58 this.remove(new QueryWrapper<SysDepartPermission>().lambda().eq(SysDepartPermission::getDepartId, departId).eq(SysDepartPermission::getPermissionId, permissionId)); 58 this.remove(new QueryWrapper<SysDepartPermission>().lambda().eq(SysDepartPermission::getDepartId, departId).eq(SysDepartPermission::getPermissionId, permissionId));
59 //删除部门权限时，删除部门角色中已授权的权限 59 //删除部门权限时，删除部门角色中已授权的权限
60 List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(new LambdaQueryWrapper<SysDepartRole>().eq(SysDepartRole::getDepartId,departId)); 60 List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(new LambdaQueryWrapper<SysDepartRole>().eq(SysDepartRole::getDepartId,departId));
61 - List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); 61 + List<Integer> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
62 if(roleIds != null && roleIds.size()>0){ 62 if(roleIds != null && roleIds.size()>0){
63 departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().eq(SysDepartRolePermission::getPermissionId,permissionId)); 63 departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().eq(SysDepartRolePermission::getPermissionId,permissionId));
64 } 64 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java
  View file @802cf13
@@ -39,7 +39,7 @@ public class SysDepartRolePermissionServiceImpl extends ServiceImpl&lt;SysDepartRol @@ -39,7 +39,7 @@ public class SysDepartRolePermissionServiceImpl extends ServiceImpl&lt;SysDepartRol
39 List<SysDepartRolePermission> list = new ArrayList<SysDepartRolePermission>(); 39 List<SysDepartRolePermission> list = new ArrayList<SysDepartRolePermission>();
40 for (String p : add) { 40 for (String p : add) {
41 if(oConvertUtils.isNotEmpty(p)) { 41 if(oConvertUtils.isNotEmpty(p)) {
42 - SysDepartRolePermission rolepms = new SysDepartRolePermission(roleId, p); 42 + SysDepartRolePermission rolepms = new SysDepartRolePermission(Integer.valueOf(roleId),Integer.valueOf(p));
43 rolepms.setOperateDate(new Date()); 43 rolepms.setOperateDate(new Date());
44 rolepms.setOperateIp(ip); 44 rolepms.setOperateIp(ip);
45 list.add(rolepms); 45 list.add(rolepms);
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java
  View file @802cf13
@@ -34,7 +34,7 @@ public class SysDepartRoleUserServiceImpl extends ServiceImpl&lt;SysDepartRoleUserM @@ -34,7 +34,7 @@ public class SysDepartRoleUserServiceImpl extends ServiceImpl&lt;SysDepartRoleUserM
34 List<SysDepartRoleUser> list = new ArrayList<>(); 34 List<SysDepartRoleUser> list = new ArrayList<>();
35 for (String roleId : add) { 35 for (String roleId : add) {
36 if(oConvertUtils.isNotEmpty(roleId)) { 36 if(oConvertUtils.isNotEmpty(roleId)) {
37 - SysDepartRoleUser rolepms = new SysDepartRoleUser(userId, roleId); 37 + SysDepartRoleUser rolepms = new SysDepartRoleUser(Integer.valueOf(userId), Integer.valueOf(roleId));
38 list.add(rolepms); 38 list.add(rolepms);
39 } 39 }
40 } 40 }
@@ -53,7 +53,7 @@ public class SysDepartRoleUserServiceImpl extends ServiceImpl&lt;SysDepartRoleUserM @@ -53,7 +53,7 @@ public class SysDepartRoleUserServiceImpl extends ServiceImpl&lt;SysDepartRoleUserM
53 public void removeDeptRoleUser(List<String> userIds, String depId) { 53 public void removeDeptRoleUser(List<String> userIds, String depId) {
54 for(String userId : userIds){ 54 for(String userId : userIds){
55 List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(new QueryWrapper<SysDepartRole>().eq("depart_id",depId)); 55 List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(new QueryWrapper<SysDepartRole>().eq("depart_id",depId));
56 - List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); 56 + List<Integer> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
57 if(roleIds != null && roleIds.size()>0){ 57 if(roleIds != null && roleIds.size()>0){
58 QueryWrapper<SysDepartRoleUser> query = new QueryWrapper<>(); 58 QueryWrapper<SysDepartRoleUser> query = new QueryWrapper<>();
59 query.eq("user_id",userId).in("drole_id",roleIds); 59 query.eq("user_id",userId).in("drole_id",roleIds);
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
  View file @802cf13
@@ -31,7 +31,7 @@ import java.util.function.Consumer; @@ -31,7 +31,7 @@ import java.util.function.Consumer;
31 * <p> 31 * <p>
32 * 部门表 服务实现类 32 * 部门表 服务实现类
33 * <p> 33 * <p>
34 - * 34 + *
35 * @Author Steve 35 * @Author Steve
36 * @Since 2019-01-22 36 * @Since 2019-01-22
37 */ 37 */
@@ -130,13 +130,14 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart @@ -130,13 +130,14 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart
130 public void saveDepartData(SysDepart sysDepart, String username) { 130 public void saveDepartData(SysDepart sysDepart, String username) {
131 if (sysDepart != null && username != null) { 131 if (sysDepart != null && username != null) {
132 if (sysDepart.getParentId() == null) { 132 if (sysDepart.getParentId() == null) {
133 - sysDepart.setParentId(""); 133 + sysDepart.setParentId(0);
134 } 134 }
135 - String s = UUID.randomUUID().toString().replace("-", "");  
136 - sysDepart.setId(s); 135 + //String s = UUID.randomUUID().toString().replace("-", "");
  136 + //sysDepart.setId(s);
  137 +
137 // 先判断该对象有无父级ID,有则意味着不是最高级,否则意味着是最高级 138 // 先判断该对象有无父级ID,有则意味着不是最高级,否则意味着是最高级
138 // 获取父级ID 139 // 获取父级ID
139 - String parentId = sysDepart.getParentId(); 140 + Integer parentId = sysDepart.getParentId();
140 //update-begin--Author:baihailong Date:20191209 for：部门编码规则生成器做成公用配置 141 //update-begin--Author:baihailong Date:20191209 for：部门编码规则生成器做成公用配置
141 JSONObject formData = new JSONObject(); 142 JSONObject formData = new JSONObject();
142 formData.put("parentId",parentId); 143 formData.put("parentId",parentId);
@@ -151,14 +152,14 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart @@ -151,14 +152,14 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart
151 } 152 }
152 153
153 } 154 }
154 - 155 +
155 /** 156 /**
156 * saveDepartData 的调用方法,生成部门编码和部门类型（作废逻辑） 157 * saveDepartData 的调用方法,生成部门编码和部门类型（作废逻辑）
157 * @deprecated 158 * @deprecated
158 * @param parentId 159 * @param parentId
159 * @return 160 * @return
160 */ 161 */
161 - private String[] generateOrgCode(String parentId) { 162 + private String[] generateOrgCode(String parentId) {
162 //update-begin--Author:Steve Date:20190201 for：组织机构添加数据代码调整 163 //update-begin--Author:Steve Date:20190201 for：组织机构添加数据代码调整
163 LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>(); 164 LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
164 LambdaQueryWrapper<SysDepart> query1 = new LambdaQueryWrapper<SysDepart>(); 165 LambdaQueryWrapper<SysDepart> query1 = new LambdaQueryWrapper<SysDepart>();
@@ -216,16 +217,16 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart @@ -216,16 +217,16 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart
216 strArray[1] = orgType; 217 strArray[1] = orgType;
217 return strArray; 218 return strArray;
218 //update-end--Author:Steve Date:20190201 for：组织机构添加数据代码调整 219 //update-end--Author:Steve Date:20190201 for：组织机构添加数据代码调整
219 - } 220 + }
  221 +
220 222
221 -  
222 /** 223 /**
223 * removeDepartDataById 对应 delete方法 根据ID删除相关部门数据 224 * removeDepartDataById 对应 delete方法 根据ID删除相关部门数据
224 - * 225 + *
225 */ 226 */
226 /* 227 /*
227 * @Override 228 * @Override
228 - * 229 + *
229 * @Transactional public boolean removeDepartDataById(String id) { 230 * @Transactional public boolean removeDepartDataById(String id) {
230 * System.out.println("要删除的ID 为=============================>>>>>"+id); boolean 231 * System.out.println("要删除的ID 为=============================>>>>>"+id); boolean
231 * flag = this.removeById(id); return flag; } 232 * flag = this.removeById(id); return flag; }
@@ -247,7 +248,7 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart @@ -247,7 +248,7 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart
247 } 248 }
248 249
249 } 250 }
250 - 251 +
251 @Override 252 @Override
252 @Transactional(rollbackFor = Exception.class) 253 @Transactional(rollbackFor = Exception.class)
253 public void deleteBatchWithChildren(List<String> ids) { 254 public void deleteBatchWithChildren(List<String> ids) {
@@ -263,7 +264,7 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart @@ -263,7 +264,7 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart
263 query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList); 264 query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList);
264 List<SysDepartRole> depRoleList = sysDepartRoleMapper.selectList(query); 265 List<SysDepartRole> depRoleList = sysDepartRoleMapper.selectList(query);
265 for(SysDepartRole deptRole : depRoleList){ 266 for(SysDepartRole deptRole : depRoleList){
266 - roleIdList.add(deptRole.getId()); 267 + roleIdList.add(deptRole.getId().toString());
267 } 268 }
268 //根据部门id删除用户与部门关系 269 //根据部门id删除用户与部门关系
269 userDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getDepId,idList)); 270 userDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getDepId,idList));
@@ -356,7 +357,7 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart @@ -356,7 +357,7 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart
356 query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList); 357 query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList);
357 List<SysDepartRole> depRoleList = sysDepartRoleMapper.selectList(query); 358 List<SysDepartRole> depRoleList = sysDepartRoleMapper.selectList(query);
358 for(SysDepartRole deptRole : depRoleList){ 359 for(SysDepartRole deptRole : depRoleList){
359 - roleIdList.add(deptRole.getId()); 360 + roleIdList.add(deptRole.getId().toString());
360 } 361 }
361 //根据部门id删除用户与部门关系 362 //根据部门id删除用户与部门关系
362 userDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getDepId,idList)); 363 userDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getDepId,idList));
@@ -372,20 +373,20 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart @@ -372,20 +373,20 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart
372 } 373 }
373 return ok; 374 return ok;
374 } 375 }
375 - 376 +
376 /** 377 /**
377 * delete 方法调用 378 * delete 方法调用
378 * @param id 379 * @param id
379 * @param idList 380 * @param idList
380 */ 381 */
381 - private void checkChildrenExists(String id, List<String> idList) { 382 + private void checkChildrenExists(String id, List<String> idList) {
382 LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>(); 383 LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
383 query.eq(SysDepart::getParentId,id); 384 query.eq(SysDepart::getParentId,id);
384 List<SysDepart> departList = this.list(query); 385 List<SysDepart> departList = this.list(query);
385 if(departList != null && departList.size() > 0) { 386 if(departList != null && departList.size() > 0) {
386 for(SysDepart depart : departList) { 387 for(SysDepart depart : departList) {
387 - idList.add(depart.getId());  
388 - this.checkChildrenExists(depart.getId(), idList); 388 + idList.add(depart.getId().toString());
  389 + this.checkChildrenExists(depart.getId().toString(), idList);
389 } 390 }
390 } 391 }
391 } 392 }
@@ -516,7 +517,7 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart @@ -516,7 +517,7 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart
516 //TODO 异步树加载key拼接__+时间戳,以便于每次展开节点会刷新数据 517 //TODO 异步树加载key拼接__+时间戳,以便于每次展开节点会刷新数据
517 //treeModel.setKey(treeModel.getKey()+"__"+System.currentTimeMillis()); 518 //treeModel.setKey(treeModel.getKey()+"__"+System.currentTimeMillis());
518 treeModel.setKey(treeModel.getKey()); 519 treeModel.setKey(treeModel.getKey());
519 - Integer count=this.baseMapper.queryCountByPid(depart.getId()); 520 + Integer count=this.baseMapper.queryCountByPid(depart.getId().toString());
520 if(count>0){ 521 if(count>0){
521 treeModel.setIsLeaf(false); 522 treeModel.setIsLeaf(false);
522 }else{ 523 }else{
@@ -572,9 +573,9 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart @@ -572,9 +573,9 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart
572 SysDepart depart = super.getOne(queryWrapper); 573 SysDepart depart = super.getOne(queryWrapper);
573 if (depart != null) { 574 if (depart != null) {
574 data.getJSONArray("parentIds").add(0, depart.getId()); 575 data.getJSONArray("parentIds").add(0, depart.getId());
575 - data.getJSONObject("parentMap").put(depart.getId(), depart); 576 + data.getJSONObject("parentMap").put(depart.getId().toString(), depart);
576 if (oConvertUtils.isNotEmpty(depart.getParentId())) { 577 if (oConvertUtils.isNotEmpty(depart.getParentId())) {
577 - this.queryAllParentIdRecursion("id", depart.getParentId(), data); 578 + this.queryAllParentIdRecursion("id", depart.getParentId().toString(), data);
578 } 579 }
579 } 580 }
580 } 581 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
  View file @802cf13
@@ -144,7 +144,7 @@ public class SysDictServiceImpl extends ServiceImpl&lt;SysDictMapper, SysDict&gt; impl @@ -144,7 +144,7 @@ public class SysDictServiceImpl extends ServiceImpl&lt;SysDictMapper, SysDict&gt; impl
144 log.debug("无缓存dictTableList的时候调用这里！"); 144 log.debug("无缓存dictTableList的时候调用这里！");
145 return sysDictMapper.queryTableDictItemsByCodeAndFilter(table,text,code,filterSql); 145 return sysDictMapper.queryTableDictItemsByCodeAndFilter(table,text,code,filterSql);
146 } 146 }
147 - 147 +
148 /** 148 /**
149 * 通过查询指定table的 text code 获取字典值text 149 * 通过查询指定table的 text code 获取字典值text
150 * dictTableCache采用redis缓存有效期10分钟 150 * dictTableCache采用redis缓存有效期10分钟
@@ -258,7 +258,7 @@ public class SysDictServiceImpl extends ServiceImpl&lt;SysDictMapper, SysDict&gt; impl @@ -258,7 +258,7 @@ public class SysDictServiceImpl extends ServiceImpl&lt;SysDictMapper, SysDict&gt; impl
258 public List<DictModel> queryAllUserBackDictModel() { 258 public List<DictModel> queryAllUserBackDictModel() {
259 return baseMapper.queryAllUserBackDictModel(); 259 return baseMapper.queryAllUserBackDictModel();
260 } 260 }
261 - 261 +
262 @Override 262 @Override
263 public List<DictModel> queryTableDictItems(String table, String text, String code, String keyword) { 263 public List<DictModel> queryTableDictItems(String table, String text, String code, String keyword) {
264 return baseMapper.queryTableDictItems(table, text, code, "%"+keyword+"%"); 264 return baseMapper.queryTableDictItems(table, text, code, "%"+keyword+"%");
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
  View file @802cf13
@@ -42,7 +42,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S @@ -42,7 +42,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S
42 42
43 @Resource 43 @Resource
44 private SysPermissionMapper sysPermissionMapper; 44 private SysPermissionMapper sysPermissionMapper;
45 - 45 +
46 @Resource 46 @Resource
47 private ISysPermissionDataRuleService permissionDataRuleService; 47 private ISysPermissionDataRuleService permissionDataRuleService;
48 48
@@ -71,7 +71,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S @@ -71,7 +71,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S
71 if(sysPermission==null) { 71 if(sysPermission==null) {
72 throw new JeecgBootException("未找到菜单信息"); 72 throw new JeecgBootException("未找到菜单信息");
73 } 73 }
74 - String pid = sysPermission.getParentId(); 74 + String pid = String.valueOf(sysPermission.getParentId());
75 if(oConvertUtils.isNotEmpty(pid)) { 75 if(oConvertUtils.isNotEmpty(pid)) {
76 int count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, pid)); 76 int count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, pid));
77 if(count==1) { 77 if(count==1) {
@@ -81,7 +81,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S @@ -81,7 +81,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S
81 } 81 }
82 sysPermissionMapper.deleteById(id); 82 sysPermissionMapper.deleteById(id);
83 // 该节点可能是子节点但也可能是其它节点的父节点,所以需要级联删除 83 // 该节点可能是子节点但也可能是其它节点的父节点,所以需要级联删除
84 - this.removeChildrenBy(sysPermission.getId()); 84 + this.removeChildrenBy(sysPermission.getId().toString());
85 //关联删除 85 //关联删除
86 Map map = new HashMap<>(); 86 Map map = new HashMap<>();
87 map.put("permission_id",id); 87 map.put("permission_id",id);
@@ -94,10 +94,10 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S @@ -94,10 +94,10 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S
94 //删除部门角色授权 94 //删除部门角色授权
95 sysDepartRolePermissionMapper.deleteByMap(map); 95 sysDepartRolePermissionMapper.deleteByMap(map);
96 } 96 }
97 - 97 +
98 /** 98 /**
99 * 根据父id删除其关联的子节点数据 99 * 根据父id删除其关联的子节点数据
100 - * 100 + *
101 * @return 101 * @return
102 */ 102 */
103 public void removeChildrenBy(String parentId) { 103 public void removeChildrenBy(String parentId) {
@@ -113,7 +113,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S @@ -113,7 +113,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S
113 this.remove(query); 113 this.remove(query);
114 // 再遍历刚才查出的集合, 根据每个对象,查找其是否仍有子级 114 // 再遍历刚才查出的集合, 根据每个对象,查找其是否仍有子级
115 for (int i = 0, len = permissionList.size(); i < len; i++) { 115 for (int i = 0, len = permissionList.size(); i < len; i++) {
116 - id = permissionList.get(i).getId(); 116 + id = permissionList.get(i).getId().toString();
117 Map map = new HashMap<>(); 117 Map map = new HashMap<>();
118 map.put("permission_id",id); 118 map.put("permission_id",id);
119 //删除数据规则 119 //删除数据规则
@@ -132,7 +132,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S @@ -132,7 +132,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S
132 } 132 }
133 } 133 }
134 } 134 }
135 - 135 +
136 /** 136 /**
137 * 逻辑删除 137 * 逻辑删除
138 */ 138 */
@@ -144,7 +144,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S @@ -144,7 +144,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S
144 if(sysPermission==null) { 144 if(sysPermission==null) {
145 throw new JeecgBootException("未找到菜单信息"); 145 throw new JeecgBootException("未找到菜单信息");
146 } 146 }
147 - String pid = sysPermission.getParentId(); 147 + String pid = String.valueOf(sysPermission.getParentId());
148 int count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, pid)); 148 int count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, pid));
149 if(count==1) { 149 if(count==1) {
150 //若父节点无其他子节点，则该父节点是叶子节点 150 //若父节点无其他子节点，则该父节点是叶子节点
@@ -163,7 +163,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S @@ -163,7 +163,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S
163 sysPermission.setParentId(null); 163 sysPermission.setParentId(null);
164 } 164 }
165 //---------------------------------------------------------------------- 165 //----------------------------------------------------------------------
166 - String pid = sysPermission.getParentId(); 166 + String pid = String.valueOf(sysPermission.getParentId());
167 if(oConvertUtils.isNotEmpty(pid)) { 167 if(oConvertUtils.isNotEmpty(pid)) {
168 //设置父节点不为叶子节点 168 //设置父节点不为叶子节点
169 this.sysPermissionMapper.setMenuLeaf(pid, 0); 169 this.sysPermissionMapper.setMenuLeaf(pid, 0);
@@ -186,7 +186,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S @@ -186,7 +186,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S
186 //---------------------------------------------------------------------- 186 //----------------------------------------------------------------------
187 //Step1.判断是否是一级菜单，是的话清空父菜单ID 187 //Step1.判断是否是一级菜单，是的话清空父菜单ID
188 if(CommonConstant.MENU_TYPE_0.equals(sysPermission.getMenuType())) { 188 if(CommonConstant.MENU_TYPE_0.equals(sysPermission.getMenuType())) {
189 - sysPermission.setParentId(""); 189 + sysPermission.setParentId(0);
190 } 190 }
191 //Step2.判断菜单下级是否有菜单，无则设置为叶子节点 191 //Step2.判断菜单下级是否有菜单，无则设置为叶子节点
192 int count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, sysPermission.getId())); 192 int count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, sysPermission.getId()));
@@ -195,9 +195,9 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S @@ -195,9 +195,9 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S
195 } 195 }
196 //---------------------------------------------------------------------- 196 //----------------------------------------------------------------------
197 this.updateById(sysPermission); 197 this.updateById(sysPermission);
198 - 198 +
199 //如果当前菜单的父菜单变了，则需要修改新父菜单和老父菜单的，叶子节点状态 199 //如果当前菜单的父菜单变了，则需要修改新父菜单和老父菜单的，叶子节点状态
200 - String pid = sysPermission.getParentId(); 200 + String pid = String.valueOf(sysPermission.getParentId());
201 if((oConvertUtils.isNotEmpty(pid) && !pid.equals(p.getParentId())) || oConvertUtils.isEmpty(pid)&&oConvertUtils.isNotEmpty(p.getParentId())) { 201 if((oConvertUtils.isNotEmpty(pid) && !pid.equals(p.getParentId())) || oConvertUtils.isEmpty(pid)&&oConvertUtils.isNotEmpty(p.getParentId())) {
202 //a.设置新的父菜单不为叶子节点 202 //a.设置新的父菜单不为叶子节点
203 this.sysPermissionMapper.setMenuLeaf(pid, 0); 203 this.sysPermissionMapper.setMenuLeaf(pid, 0);
@@ -205,13 +205,13 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S @@ -205,13 +205,13 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S
205 int cc = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, p.getParentId())); 205 int cc = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, p.getParentId()));
206 if(cc==0) { 206 if(cc==0) {
207 if(oConvertUtils.isNotEmpty(p.getParentId())) { 207 if(oConvertUtils.isNotEmpty(p.getParentId())) {
208 - this.sysPermissionMapper.setMenuLeaf(p.getParentId(), 1); 208 + this.sysPermissionMapper.setMenuLeaf(p.getParentId().toString(), 1);
209 } 209 }
210 } 210 }
211 - 211 +
212 } 212 }
213 } 213 }
214 - 214 +
215 } 215 }
216 216
217 @Override 217 @Override
@@ -228,7 +228,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S @@ -228,7 +228,7 @@ public class SysPermissionServiceImpl extends ServiceImpl&lt;SysPermissionMapper, S
228 query.eq(SysPermissionDataRule::getPermissionId, id); 228 query.eq(SysPermissionDataRule::getPermissionId, id);
229 int countValue = this.permissionDataRuleService.count(query); 229 int countValue = this.permissionDataRuleService.count(query);
230 if(countValue > 0) { 230 if(countValue > 0) {
231 - this.permissionDataRuleService.remove(query); 231 + this.permissionDataRuleService.remove(query);
232 } 232 }
233 } 233 }
234 234
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java
  View file @802cf13
@@ -47,7 +47,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl&lt;SysRolePermissionM @@ -47,7 +47,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl&lt;SysRolePermissionM
47 String[] arr = permissionIds.split(","); 47 String[] arr = permissionIds.split(",");
48 for (String p : arr) { 48 for (String p : arr) {
49 if(oConvertUtils.isNotEmpty(p)) { 49 if(oConvertUtils.isNotEmpty(p)) {
50 - SysRolePermission rolepms = new SysRolePermission(roleId, p); 50 + SysRolePermission rolepms = new SysRolePermission(Integer.valueOf(roleId), Integer.valueOf(p));
51 rolepms.setOperateDate(new Date()); 51 rolepms.setOperateDate(new Date());
52 rolepms.setOperateIp(ip); 52 rolepms.setOperateIp(ip);
53 list.add(rolepms); 53 list.add(rolepms);
@@ -72,7 +72,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl&lt;SysRolePermissionM @@ -72,7 +72,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl&lt;SysRolePermissionM
72 List<SysRolePermission> list = new ArrayList<SysRolePermission>(); 72 List<SysRolePermission> list = new ArrayList<SysRolePermission>();
73 for (String p : add) { 73 for (String p : add) {
74 if(oConvertUtils.isNotEmpty(p)) { 74 if(oConvertUtils.isNotEmpty(p)) {
75 - SysRolePermission rolepms = new SysRolePermission(roleId, p); 75 + SysRolePermission rolepms = new SysRolePermission(Integer.valueOf(roleId), Integer.valueOf(p));
76 rolepms.setOperateDate(new Date()); 76 rolepms.setOperateDate(new Date());
77 rolepms.setOperateIp(ip); 77 rolepms.setOperateIp(ip);
78 list.add(rolepms); 78 list.add(rolepms);
@@ -80,7 +80,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl&lt;SysRolePermissionM @@ -80,7 +80,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl&lt;SysRolePermissionM
80 } 80 }
81 this.saveBatch(list); 81 this.saveBatch(list);
82 } 82 }
83 - 83 +
84 List<String> delete = getDiff(permissionIds,lastPermissionIds); 84 List<String> delete = getDiff(permissionIds,lastPermissionIds);
85 if(delete!=null && delete.size()>0) { 85 if(delete!=null && delete.size()>0) {
86 for (String permissionId : delete) { 86 for (String permissionId : delete) {
@@ -88,7 +88,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl&lt;SysRolePermissionM @@ -88,7 +88,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl&lt;SysRolePermissionM
88 } 88 }
89 } 89 }
90 } 90 }
91 - 91 +
92 /** 92 /**
93 * 从diff中找出main中没有的元素 93 * 从diff中找出main中没有的元素
94 * @param main 94 * @param main
@@ -102,7 +102,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl&lt;SysRolePermissionM @@ -102,7 +102,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl&lt;SysRolePermissionM
102 if(oConvertUtils.isEmpty(main)) { 102 if(oConvertUtils.isEmpty(main)) {
103 return Arrays.asList(diff.split(",")); 103 return Arrays.asList(diff.split(","));
104 } 104 }
105 - 105 +
106 String[] mainArr = main.split(","); 106 String[] mainArr = main.split(",");
107 String[] diffArr = diff.split(","); 107 String[] diffArr = diff.split(",");
108 Map<String, Integer> map = new HashMap<>(); 108 Map<String, Integer> map = new HashMap<>();
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java
  View file @802cf13
@@ -33,17 +33,16 @@ import java.util.List; @@ -33,17 +33,16 @@ import java.util.List;
33 @Service 33 @Service
34 @Slf4j 34 @Slf4j
35 public class SysThirdAccountServiceImpl extends ServiceImpl<SysThirdAccountMapper, SysThirdAccount> implements ISysThirdAccountService { 35 public class SysThirdAccountServiceImpl extends ServiceImpl<SysThirdAccountMapper, SysThirdAccount> implements ISysThirdAccountService {
36 - 36 +
37 @Autowired 37 @Autowired
38 private SysThirdAccountMapper sysThirdAccountMapper; 38 private SysThirdAccountMapper sysThirdAccountMapper;
39 -  
40 @Autowired 39 @Autowired
41 private SysUserMapper sysUserMapper; 40 private SysUserMapper sysUserMapper;
42 @Autowired 41 @Autowired
43 private SysRoleMapper sysRoleMapper; 42 private SysRoleMapper sysRoleMapper;
44 @Autowired 43 @Autowired
45 private SysUserRoleMapper sysUserRoleMapper; 44 private SysUserRoleMapper sysUserRoleMapper;
46 - 45 +
47 @Override 46 @Override
48 public void updateThirdUserId(SysUser sysUser,String thirdUserUuid) { 47 public void updateThirdUserId(SysUser sysUser,String thirdUserUuid) {
49 //修改第三方登录账户表使其进行添加用户id 48 //修改第三方登录账户表使其进行添加用户id
@@ -51,7 +50,7 @@ public class SysThirdAccountServiceImpl extends ServiceImpl&lt;SysThirdAccountMappe @@ -51,7 +50,7 @@ public class SysThirdAccountServiceImpl extends ServiceImpl&lt;SysThirdAccountMappe
51 query.eq(SysThirdAccount::getThirdUserUuid,thirdUserUuid); 50 query.eq(SysThirdAccount::getThirdUserUuid,thirdUserUuid);
52 SysThirdAccount account = sysThirdAccountMapper.selectOne(query); 51 SysThirdAccount account = sysThirdAccountMapper.selectOne(query);
53 SysThirdAccount sysThirdAccount = new SysThirdAccount(); 52 SysThirdAccount sysThirdAccount = new SysThirdAccount();
54 - sysThirdAccount.setSysUserId(sysUser.getId()); 53 + sysThirdAccount.setSysUserId(sysUser.getId().toString());
55 //根据当前用户id和登录方式查询第三方登录表 54 //根据当前用户id和登录方式查询第三方登录表
56 LambdaQueryWrapper<SysThirdAccount> thirdQuery = new LambdaQueryWrapper<>(); 55 LambdaQueryWrapper<SysThirdAccount> thirdQuery = new LambdaQueryWrapper<>();
57 thirdQuery.eq(SysThirdAccount::getSysUserId,sysUser.getId()); 56 thirdQuery.eq(SysThirdAccount::getSysUserId,sysUser.getId());
@@ -64,7 +63,7 @@ public class SysThirdAccountServiceImpl extends ServiceImpl&lt;SysThirdAccountMappe @@ -64,7 +63,7 @@ public class SysThirdAccountServiceImpl extends ServiceImpl&lt;SysThirdAccountMappe
64 //更新用户账户表sys_user_id 63 //更新用户账户表sys_user_id
65 sysThirdAccountMapper.update(sysThirdAccount,query); 64 sysThirdAccountMapper.update(sysThirdAccount,query);
66 } 65 }
67 - 66 +
68 @Override 67 @Override
69 public SysUser createUser(String phone, String thirdUserUuid) { 68 public SysUser createUser(String phone, String thirdUserUuid) {
70 //先查询第三方，获取登录方式 69 //先查询第三方，获取登录方式
@@ -99,20 +98,20 @@ public class SysThirdAccountServiceImpl extends ServiceImpl&lt;SysThirdAccountMappe @@ -99,20 +98,20 @@ public class SysThirdAccountServiceImpl extends ServiceImpl&lt;SysThirdAccountMappe
99 sysThirdAccountMapper.update(sysThirdAccount,query); 98 sysThirdAccountMapper.update(sysThirdAccount,query);
100 return user; 99 return user;
101 } 100 }
102 - 101 +
103 public String saveThirdUser(SysUser sysUser) { 102 public String saveThirdUser(SysUser sysUser) {
104 //保存用户 103 //保存用户
105 - String userid = UUIDGenerator.generate();  
106 - sysUser.setId(userid); 104 + //String userid = UUIDGenerator.generate();
  105 + //sysUser.setId(userid);
107 sysUserMapper.insert(sysUser); 106 sysUserMapper.insert(sysUser);
108 //获取第三方角色 107 //获取第三方角色
109 SysRole sysRole = sysRoleMapper.selectOne(new LambdaQueryWrapper<SysRole>().eq(SysRole::getRoleCode, "third_role")); 108 SysRole sysRole = sysRoleMapper.selectOne(new LambdaQueryWrapper<SysRole>().eq(SysRole::getRoleCode, "third_role"));
110 //保存用户角色 109 //保存用户角色
111 SysUserRole userRole = new SysUserRole(); 110 SysUserRole userRole = new SysUserRole();
112 userRole.setRoleId(sysRole.getId()); 111 userRole.setRoleId(sysRole.getId());
113 - userRole.setUserId(userid); 112 + userRole.setUserId(sysUser.getId());
114 sysUserRoleMapper.insert(userRole); 113 sysUserRoleMapper.insert(userRole);
115 - return userid; 114 + return sysUser.getId().toString();
116 } 115 }
117 116
118 @Override 117 @Override
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
  View file @802cf13
@@ -36,7 +36,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl&lt;SysUserDepartMapper, S @@ -36,7 +36,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl&lt;SysUserDepartMapper, S
36 private ISysDepartService sysDepartService; 36 private ISysDepartService sysDepartService;
37 @Autowired 37 @Autowired
38 private ISysUserService sysUserService; 38 private ISysUserService sysUserService;
39 - 39 +
40 40
41 /** 41 /**
42 * 根据用户id查询部门信息 42 * 根据用户id查询部门信息
@@ -52,7 +52,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl&lt;SysUserDepartMapper, S @@ -52,7 +52,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl&lt;SysUserDepartMapper, S
52 List<SysUserDepart> userDepList = this.list(queryUDep); 52 List<SysUserDepart> userDepList = this.list(queryUDep);
53 if(userDepList != null && userDepList.size() > 0) { 53 if(userDepList != null && userDepList.size() > 0) {
54 for(SysUserDepart userDepart : userDepList) { 54 for(SysUserDepart userDepart : userDepList) {
55 - depIdList.add(userDepart.getDepId()); 55 + depIdList.add(userDepart.getDepId().toString());
56 } 56 }
57 queryDep.in(SysDepart::getId, depIdList); 57 queryDep.in(SysDepart::getId, depIdList);
58 List<SysDepart> depList = sysDepartService.list(queryDep); 58 List<SysDepart> depList = sysDepartService.list(queryDep);
@@ -67,8 +67,8 @@ public class SysUserDepartServiceImpl extends ServiceImpl&lt;SysUserDepartMapper, S @@ -67,8 +67,8 @@ public class SysUserDepartServiceImpl extends ServiceImpl&lt;SysUserDepartMapper, S
67 e.fillInStackTrace(); 67 e.fillInStackTrace();
68 } 68 }
69 return null; 69 return null;
70 -  
71 - 70 +
  71 +
72 } 72 }
73 73
74 74
@@ -83,7 +83,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl&lt;SysUserDepartMapper, S @@ -83,7 +83,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl&lt;SysUserDepartMapper, S
83 List<SysUserDepart> uDepList = this.list(queryUDep); 83 List<SysUserDepart> uDepList = this.list(queryUDep);
84 if(uDepList != null && uDepList.size() > 0) { 84 if(uDepList != null && uDepList.size() > 0) {
85 for(SysUserDepart uDep : uDepList) { 85 for(SysUserDepart uDep : uDepList) {
86 - userIdList.add(uDep.getUserId()); 86 + userIdList.add(uDep.getUserId().toString());
87 } 87 }
88 List<SysUser> userList = (List<SysUser>) sysUserService.listByIds(userIdList); 88 List<SysUser> userList = (List<SysUser>) sysUserService.listByIds(userIdList);
89 //update-begin-author:taoyan date:201905047 for:接口调用查询返回结果不能返回密码相关信息 89 //update-begin-author:taoyan date:201905047 for:接口调用查询返回结果不能返回密码相关信息
@@ -112,7 +112,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl&lt;SysUserDepartMapper, S @@ -112,7 +112,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl&lt;SysUserDepartMapper, S
112 // 返回的用户数据去掉密码信息 112 // 返回的用户数据去掉密码信息
113 sysUser.setSalt(""); 113 sysUser.setSalt("");
114 sysUser.setPassword(""); 114 sysUser.setPassword("");
115 - map.put(sysUser.getId(), sysUser); 115 + map.put(sysUser.getId().toString(), sysUser);
116 } 116 }
117 return new ArrayList<SysUser>(map.values()); 117 return new ArrayList<SysUser>(map.values());
118 //update-end-author:taoyan date:20210422 for: 根据部门选择用户接口代码优化 118 //update-end-author:taoyan date:20210422 for: 根据部门选择用户接口代码优化
@@ -140,7 +140,13 @@ public class SysUserDepartServiceImpl extends ServiceImpl&lt;SysUserDepartMapper, S @@ -140,7 +140,13 @@ public class SysUserDepartServiceImpl extends ServiceImpl&lt;SysUserDepartMapper, S
140 } 140 }
141 List<SysUser> userList = pageList.getRecords(); 141 List<SysUser> userList = pageList.getRecords();
142 if(userList!=null && userList.size()>0){ 142 if(userList!=null && userList.size()>0){
143 - List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList()); 143 + List<String> userIds =new ArrayList<>();
  144 +
  145 + //List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
  146 + for (SysUser user : userList) {
  147 + userIds.add(user.getId().toString());
  148 + }
  149 +
144 Map<String, SysUser> map = new HashMap<String, SysUser>(); 150 Map<String, SysUser> map = new HashMap<String, SysUser>();
145 if(userIds!=null && userIds.size()>0){ 151 if(userIds!=null && userIds.size()>0){
146 // 查部门名称 152 // 查部门名称
@@ -151,7 +157,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl&lt;SysUserDepartMapper, S @@ -151,7 +157,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl&lt;SysUserDepartMapper, S
151 item.setSalt(""); 157 item.setSalt("");
152 item.setPassword(""); 158 item.setPassword("");
153 // 去重 159 // 去重
154 - map.put(item.getId(), item); 160 + map.put(item.getId().toString(), item);
155 }); 161 });
156 } 162 }
157 pageList.setRecords(new ArrayList<SysUser>(map.values())); 163 pageList.setRecords(new ArrayList<SysUser>(map.values()));
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
  View file @802cf13
@@ -131,7 +131,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl @@ -131,7 +131,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
131 if(oConvertUtils.isNotEmpty(roles)) { 131 if(oConvertUtils.isNotEmpty(roles)) {
132 String[] arr = roles.split(","); 132 String[] arr = roles.split(",");
133 for (String roleId : arr) { 133 for (String roleId : arr) {
134 - SysUserRole userRole = new SysUserRole(user.getId(), roleId); 134 + SysUserRole userRole = new SysUserRole(user.getId(), Integer.valueOf(roleId));
135 sysUserRoleMapper.insert(userRole); 135 sysUserRoleMapper.insert(userRole);
136 } 136 }
137 } 137 }
@@ -147,7 +147,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl @@ -147,7 +147,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
147 if(oConvertUtils.isNotEmpty(roles)) { 147 if(oConvertUtils.isNotEmpty(roles)) {
148 String[] arr = roles.split(","); 148 String[] arr = roles.split(",");
149 for (String roleId : arr) { 149 for (String roleId : arr) {
150 - SysUserRole userRole = new SysUserRole(user.getId(), roleId); 150 + SysUserRole userRole = new SysUserRole(user.getId(), Integer.valueOf(roleId));
151 sysUserRoleMapper.insert(userRole); 151 sysUserRoleMapper.insert(userRole);
152 } 152 }
153 } 153 }
@@ -212,7 +212,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl @@ -212,7 +212,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
212 } 212 }
213 213
214 //多部门支持in查询 214 //多部门支持in查询
215 - List<SysDepart> list = sysDepartMapper.queryUserDeparts(user.getId()); 215 + List<SysDepart> list = sysDepartMapper.queryUserDeparts(user.getId().toString());
216 List<String> sysMultiOrgCode = new ArrayList<String>(); 216 List<String> sysMultiOrgCode = new ArrayList<String>();
217 if(list==null || list.size()==0) { 217 if(list==null || list.size()==0) {
218 //当前用户无部门 218 //当前用户无部门
@@ -310,7 +310,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl @@ -310,7 +310,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
310 if(oConvertUtils.isNotEmpty(selectedParts)) { 310 if(oConvertUtils.isNotEmpty(selectedParts)) {
311 String[] arr = selectedParts.split(","); 311 String[] arr = selectedParts.split(",");
312 for (String deaprtId : arr) { 312 for (String deaprtId : arr) {
313 - SysUserDepart userDeaprt = new SysUserDepart(user.getId(), deaprtId); 313 + SysUserDepart userDeaprt = new SysUserDepart(user.getId(),Integer.valueOf(deaprtId));
314 sysUserDepartMapper.insert(userDeaprt); 314 sysUserDepartMapper.insert(userDeaprt);
315 } 315 }
316 } 316 }
@@ -334,7 +334,12 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl @@ -334,7 +334,12 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
334 if(!Arrays.asList(arr).contains(depart.getDepId())){ 334 if(!Arrays.asList(arr).contains(depart.getDepId())){
335 List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList( 335 List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(
336 new QueryWrapper<SysDepartRole>().lambda().eq(SysDepartRole::getDepartId,depart.getDepId())); 336 new QueryWrapper<SysDepartRole>().lambda().eq(SysDepartRole::getDepartId,depart.getDepId()));
337 - List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); 337 +
  338 + List<String> roleIds=new ArrayList<>();
  339 + for (SysDepartRole role : sysDepartRoleList) {
  340 + roleIds.add(role.getId().toString());
  341 + }
  342 + //List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
338 if(roleIds != null && roleIds.size()>0){ 343 if(roleIds != null && roleIds.size()>0){
339 departRoleUserMapper.delete(new QueryWrapper<SysDepartRoleUser>().lambda().eq(SysDepartRoleUser::getUserId, user.getId()) 344 departRoleUserMapper.delete(new QueryWrapper<SysDepartRoleUser>().lambda().eq(SysDepartRoleUser::getUserId, user.getId())
340 .in(SysDepartRoleUser::getDroleId,roleIds)); 345 .in(SysDepartRoleUser::getDroleId,roleIds));
@@ -346,7 +351,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl @@ -346,7 +351,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
346 sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId())); 351 sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId()));
347 if(oConvertUtils.isNotEmpty(departs)) { 352 if(oConvertUtils.isNotEmpty(departs)) {
348 for (String departId : arr) { 353 for (String departId : arr) {
349 - SysUserDepart userDepart = new SysUserDepart(user.getId(), departId); 354 + SysUserDepart userDepart = new SysUserDepart(user.getId(), Integer.valueOf(departId));
350 sysUserDepartMapper.insert(userDepart); 355 sysUserDepartMapper.insert(userDepart);
351 } 356 }
352 } 357 }
@@ -439,15 +444,15 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl @@ -439,15 +444,15 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
439 @Override 444 @Override
440 public void saveThirdUser(SysUser sysUser) { 445 public void saveThirdUser(SysUser sysUser) {
441 //保存用户 446 //保存用户
442 - String userid = UUIDGenerator.generate();  
443 - sysUser.setId(userid); 447 + //String userid = UUIDGenerator.generate();
  448 + //sysUser.setId(userid);
444 baseMapper.insert(sysUser); 449 baseMapper.insert(sysUser);
445 //获取第三方角色 450 //获取第三方角色
446 SysRole sysRole = sysRoleMapper.selectOne(new LambdaQueryWrapper<SysRole>().eq(SysRole::getRoleCode, "third_role")); 451 SysRole sysRole = sysRoleMapper.selectOne(new LambdaQueryWrapper<SysRole>().eq(SysRole::getRoleCode, "third_role"));
447 //保存用户角色 452 //保存用户角色
448 SysUserRole userRole = new SysUserRole(); 453 SysUserRole userRole = new SysUserRole();
449 userRole.setRoleId(sysRole.getId()); 454 userRole.setRoleId(sysRole.getId());
450 - userRole.setUserId(userid); 455 + userRole.setUserId(sysUser.getId());
451 sysUserRoleMapper.insert(userRole); 456 sysUserRoleMapper.insert(userRole);
452 } 457 }
453 458
@@ -465,7 +470,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl @@ -465,7 +470,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
465 if(oConvertUtils.isNotEmpty(selectedRoles)) { 470 if(oConvertUtils.isNotEmpty(selectedRoles)) {
466 String[] arr = selectedRoles.split(","); 471 String[] arr = selectedRoles.split(",");
467 for (String roleId : arr) { 472 for (String roleId : arr) {
468 - SysUserRole userRole = new SysUserRole(user.getId(), roleId); 473 + SysUserRole userRole = new SysUserRole(user.getId(), Integer.valueOf(roleId));
469 sysUserRoleMapper.insert(userRole); 474 sysUserRoleMapper.insert(userRole);
470 } 475 }
471 } 476 }
@@ -473,7 +478,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl @@ -473,7 +478,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
473 if(oConvertUtils.isNotEmpty(selectedDeparts)) { 478 if(oConvertUtils.isNotEmpty(selectedDeparts)) {
474 String[] arr = selectedDeparts.split(","); 479 String[] arr = selectedDeparts.split(",");
475 for (String deaprtId : arr) { 480 for (String deaprtId : arr) {
476 - SysUserDepart userDeaprt = new SysUserDepart(user.getId(), deaprtId); 481 + SysUserDepart userDeaprt = new SysUserDepart(user.getId(), Integer.valueOf(deaprtId));
477 sysUserDepartMapper.insert(userDeaprt); 482 sysUserDepartMapper.insert(userDeaprt);
478 } 483 }
479 } 484 }
@@ -491,7 +496,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl @@ -491,7 +496,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
491 if(oConvertUtils.isNotEmpty(roles)) { 496 if(oConvertUtils.isNotEmpty(roles)) {
492 String[] arr = roles.split(","); 497 String[] arr = roles.split(",");
493 for (String roleId : arr) { 498 for (String roleId : arr) {
494 - SysUserRole userRole = new SysUserRole(user.getId(), roleId); 499 + SysUserRole userRole = new SysUserRole(user.getId(), Integer.valueOf(roleId));
495 sysUserRoleMapper.insert(userRole); 500 sysUserRoleMapper.insert(userRole);
496 } 501 }
497 } 502 }
@@ -509,7 +514,11 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl @@ -509,7 +514,11 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
509 if(!Arrays.asList(arr).contains(depart.getDepId())){ 514 if(!Arrays.asList(arr).contains(depart.getDepId())){
510 List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList( 515 List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(
511 new QueryWrapper<SysDepartRole>().lambda().eq(SysDepartRole::getDepartId,depart.getDepId())); 516 new QueryWrapper<SysDepartRole>().lambda().eq(SysDepartRole::getDepartId,depart.getDepId()));
512 - List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); 517 + List<String> roleIds=new ArrayList<>();
  518 + for (SysDepartRole role : sysDepartRoleList) {
  519 + roleIds.add(role.getId().toString());
  520 + }
  521 + //List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
513 if(roleIds != null && roleIds.size()>0){ 522 if(roleIds != null && roleIds.size()>0){
514 departRoleUserMapper.delete(new QueryWrapper<SysDepartRoleUser>().lambda().eq(SysDepartRoleUser::getUserId, user.getId()) 523 departRoleUserMapper.delete(new QueryWrapper<SysDepartRoleUser>().lambda().eq(SysDepartRoleUser::getUserId, user.getId())
515 .in(SysDepartRoleUser::getDroleId,roleIds)); 524 .in(SysDepartRoleUser::getDroleId,roleIds));
@@ -521,7 +530,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl @@ -521,7 +530,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
521 sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId())); 530 sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId()));
522 if(oConvertUtils.isNotEmpty(departs)) { 531 if(oConvertUtils.isNotEmpty(departs)) {
523 for (String departId : arr) { 532 for (String departId : arr) {
524 - SysUserDepart userDepart = new SysUserDepart(user.getId(), departId); 533 + SysUserDepart userDepart = new SysUserDepart(user.getId(), Integer.valueOf(departId));
525 sysUserDepartMapper.insert(userDepart); 534 sysUserDepartMapper.insert(userDepart);
526 } 535 }
527 } 536 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java
  View file @802cf13
@@ -214,7 +214,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { @@ -214,7 +214,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
214 // 执行更新操作 214 // 执行更新操作
215 SysDepart updateSysDepart = this.dtDepartmentToSysDepart(departmentTree, sysDepart); 215 SysDepart updateSysDepart = this.dtDepartmentToSysDepart(departmentTree, sysDepart);
216 if (sysParentId != null) { 216 if (sysParentId != null) {
217 - updateSysDepart.setParentId(sysParentId); 217 + updateSysDepart.setParentId(Integer.valueOf(sysParentId));
218 } 218 }
219 try { 219 try {
220 sysDepartService.updateDepartDataById(updateSysDepart, username); 220 sysDepartService.updateDepartDataById(updateSysDepart, username);
@@ -225,13 +225,13 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { @@ -225,13 +225,13 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
225 } 225 }
226 if (departmentTree.hasChildren()) { 226 if (departmentTree.hasChildren()) {
227 // 紧接着同步子级 227 // 紧接着同步子级
228 - this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), updateSysDepart.getId(), username, syncInfo, accessToken); 228 + this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), updateSysDepart.getId().toString(), username, syncInfo, accessToken);
229 } 229 }
230 } else { 230 } else {
231 // 执行新增操作 231 // 执行新增操作
232 SysDepart newSysDepart = this.dtDepartmentToSysDepart(departmentTree, null); 232 SysDepart newSysDepart = this.dtDepartmentToSysDepart(departmentTree, null);
233 if (sysParentId != null) { 233 if (sysParentId != null) {
234 - newSysDepart.setParentId(sysParentId); 234 + newSysDepart.setParentId(Integer.valueOf(sysParentId));
235 // 2 = 组织机构 235 // 2 = 组织机构
236 newSysDepart.setOrgCategory("2"); 236 newSysDepart.setOrgCategory("2");
237 } else { 237 } else {
@@ -243,7 +243,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { @@ -243,7 +243,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
243 // 更新钉钉 source_identifier 243 // 更新钉钉 source_identifier
244 Department updateDtDepart = new Department(); 244 Department updateDtDepart = new Department();
245 updateDtDepart.setDept_id(departmentTree.getDept_id()); 245 updateDtDepart.setDept_id(departmentTree.getDept_id());
246 - updateDtDepart.setSource_identifier(newSysDepart.getId()); 246 + updateDtDepart.setSource_identifier(newSysDepart.getId().toString());
247 Response response = JdtDepartmentAPI.update(updateDtDepart, accessToken); 247 Response response = JdtDepartmentAPI.update(updateDtDepart, accessToken);
248 if (!response.isSuccess()) { 248 if (!response.isSuccess()) {
249 throw new RuntimeException(response.getErrmsg()); 249 throw new RuntimeException(response.getErrmsg());
@@ -255,7 +255,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { @@ -255,7 +255,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
255 } 255 }
256 // 紧接着同步子级 256 // 紧接着同步子级
257 if (departmentTree.hasChildren()) { 257 if (departmentTree.hasChildren()) {
258 - this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), newSysDepart.getId(), username, syncInfo, accessToken); 258 + this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), newSysDepart.getId().toString(), username, syncInfo, accessToken);
259 } 259 }
260 } 260 }
261 } 261 }
@@ -323,7 +323,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { @@ -323,7 +323,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
323 * 1. 查询 sys_third_account（第三方账号表）是否有数据，如果有代表已同步 323 * 1. 查询 sys_third_account（第三方账号表）是否有数据，如果有代表已同步
324 * 2. 本地表里没有，就先用手机号判断，不通过再用username(用户账号)判断。 324 * 2. 本地表里没有，就先用手机号判断，不通过再用username(用户账号)判断。
325 */ 325 */
326 - SysThirdAccount sysThirdAccount = sysThirdAccountService.getOneBySysUserId(sysUser.getId(), THIRD_TYPE); 326 + SysThirdAccount sysThirdAccount = sysThirdAccountService.getOneBySysUserId(sysUser.getId().toString(), THIRD_TYPE);
327 if (sysThirdAccount != null && oConvertUtils.isNotEmpty(sysThirdAccount.getThirdUserId())) { 327 if (sysThirdAccount != null && oConvertUtils.isNotEmpty(sysThirdAccount.getThirdUserId())) {
328 // sys_third_account 表匹配成功，通过第三方userId查询出第三方userInfo 328 // sys_third_account 表匹配成功，通过第三方userId查询出第三方userInfo
329 dtUserInfo = JdtUserAPI.getUserById(sysThirdAccount.getThirdUserId(), accessToken); 329 dtUserInfo = JdtUserAPI.getUserById(sysThirdAccount.getThirdUserId(), accessToken);
@@ -362,7 +362,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { @@ -362,7 +362,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
362 if (apiSuccess && (sysThirdAccount == null || oConvertUtils.isEmpty(sysThirdAccount.getThirdUserId()))) { 362 if (apiSuccess && (sysThirdAccount == null || oConvertUtils.isEmpty(sysThirdAccount.getThirdUserId()))) {
363 if (sysThirdAccount == null) { 363 if (sysThirdAccount == null) {
364 sysThirdAccount = new SysThirdAccount(); 364 sysThirdAccount = new SysThirdAccount();
365 - sysThirdAccount.setSysUserId(sysUser.getId()); 365 + sysThirdAccount.setSysUserId(sysUser.getId().toString());
366 sysThirdAccount.setStatus(1); 366 sysThirdAccount.setStatus(1);
367 sysThirdAccount.setDelFlag(0); 367 sysThirdAccount.setDelFlag(0);
368 sysThirdAccount.setThirdType(THIRD_TYPE); 368 sysThirdAccount.setThirdType(THIRD_TYPE);
@@ -408,7 +408,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { @@ -408,7 +408,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
408 this.syncUserCollectErrInfo(e, dtUserInfo, syncInfo); 408 this.syncUserCollectErrInfo(e, dtUserInfo, syncInfo);
409 } 409 }
410 //第三方账号关系表 410 //第三方账号关系表
411 - this.thirdAccountSaveOrUpdate(sysThirdAccount, updateSysUser.getId(), dtUserInfo.getUserid()); 411 + this.thirdAccountSaveOrUpdate(sysThirdAccount, updateSysUser.getId().toString(), dtUserInfo.getUserid());
412 }else{ 412 }else{
413 // 如果没有匹配到用户，则走创建逻辑 413 // 如果没有匹配到用户，则走创建逻辑
414 SysUser newSysUser = this.dtUserToSysUser(dtUserInfo); 414 SysUser newSysUser = this.dtUserToSysUser(dtUserInfo);
@@ -420,7 +420,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { @@ -420,7 +420,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
420 this.syncUserCollectErrInfo(e, dtUserInfo, syncInfo); 420 this.syncUserCollectErrInfo(e, dtUserInfo, syncInfo);
421 } 421 }
422 //第三方账号关系表 422 //第三方账号关系表
423 - this.thirdAccountSaveOrUpdate(null, newSysUser.getId(), dtUserInfo.getUserid()); 423 + this.thirdAccountSaveOrUpdate(null, newSysUser.getId().toString(), dtUserInfo.getUserid());
424 } 424 }
425 } 425 }
426 return syncInfo; 426 return syncInfo;
@@ -533,7 +533,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { @@ -533,7 +533,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
533 List<Integer> departmentIdList = new ArrayList<>(); 533 List<Integer> departmentIdList = new ArrayList<>();
534 for (SysDepart sysDepart : departList) { 534 for (SysDepart sysDepart : departList) {
535 // 企业微信的部门id 535 // 企业微信的部门id
536 - Department department = this.getDepartmentByDepartId(sysDepart.getId(), allDepartment); 536 + Department department = this.getDepartmentByDepartId(sysDepart.getId().toString(), allDepartment);
537 if (department != null) { 537 if (department != null) {
538 departmentIdList.add(department.getDept_id()); 538 departmentIdList.add(department.getDept_id());
539 } 539 }
@@ -622,7 +622,11 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { @@ -622,7 +622,11 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
622 } 622 }
623 // 根据用户部门 623 // 根据用户部门
624 LambdaQueryWrapper<SysDepart> departQueryWrapper = new LambdaQueryWrapper<>(); 624 LambdaQueryWrapper<SysDepart> departQueryWrapper = new LambdaQueryWrapper<>();
625 - List<String> departIdList = sysUserDepartList.stream().map(SysUserDepart::getDepId).collect(Collectors.toList()); 625 + List<String> departIdList=new ArrayList<>();
  626 + for (SysUserDepart s : sysUserDepartList) {
  627 + departIdList.add(s.getId().toString());
  628 + }
  629 + //List<String> departIdList = sysUserDepartList.stream().map(SysUserDepart::getDepId).collect(Collectors.toList());
626 departQueryWrapper.in(SysDepart::getId, departIdList); 630 departQueryWrapper.in(SysDepart::getId, departIdList);
627 List<SysDepart> departList = sysDepartService.list(departQueryWrapper); 631 List<SysDepart> departList = sysDepartService.list(departQueryWrapper);
628 return departList.size() == 0 ? null : departList; 632 return departList.size() == 0 ? null : departList;
@@ -646,7 +650,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { @@ -646,7 +650,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
646 */ 650 */
647 private Department sysDepartToDtDepartment(SysDepartTreeModel departTree, Integer parentId) { 651 private Department sysDepartToDtDepartment(SysDepartTreeModel departTree, Integer parentId) {
648 Department department = new Department(); 652 Department department = new Department();
649 - department.setSource_identifier(departTree.getId()); 653 + department.setSource_identifier(departTree.getId().toString());
650 return this.sysDepartToDtDepartment(departTree, department, parentId); 654 return this.sysDepartToDtDepartment(departTree, department, parentId);
651 } 655 }
652 656
@@ -809,7 +813,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { @@ -809,7 +813,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
809 LambdaQueryWrapper<SysAnnouncementSend> queryWrapper = new LambdaQueryWrapper<>(); 813 LambdaQueryWrapper<SysAnnouncementSend> queryWrapper = new LambdaQueryWrapper<>();
810 queryWrapper.eq(SysAnnouncementSend::getAnntId, announcement.getId()); 814 queryWrapper.eq(SysAnnouncementSend::getAnntId, announcement.getId());
811 SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendMapper.selectOne(queryWrapper); 815 SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendMapper.selectOne(queryWrapper);
812 - userIds = new String[] {sysAnnouncementSend.getUserId()}; 816 + userIds = new String[] {sysAnnouncementSend.getUserId().toString()};
813 } 817 }
814 818
815 if(userIds!=null){ 819 if(userIds!=null){
@@ -900,7 +904,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { @@ -900,7 +904,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
900 thirdAccount.setRealname(appUser.getName()); 904 thirdAccount.setRealname(appUser.getName());
901 thirdAccount.setThirdUserId(appUser.getUserid()); 905 thirdAccount.setThirdUserId(appUser.getUserid());
902 thirdAccount.setThirdUserUuid(appUser.getUserid()); 906 thirdAccount.setThirdUserUuid(appUser.getUserid());
903 - thirdAccount.setSysUserId(sysUser.getId()); 907 + thirdAccount.setSysUserId(sysUser.getId().toString());
904 sysThirdAccountService.updateById(thirdAccount); 908 sysThirdAccountService.updateById(thirdAccount);
905 return sysUser; 909 return sysUser;
906 } else { 910 } else {
@@ -911,4 +915,4 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { @@ -911,4 +915,4 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
911 } 915 }
912 } 916 }
913 917
914 -}  
915 \ No newline at end of file 918 \ No newline at end of file
  919 +}
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java
  View file @802cf13
@@ -235,7 +235,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { @@ -235,7 +235,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
235 // 执行更新操作 235 // 执行更新操作
236 SysDepart updateSysDepart = this.qwDepartmentToSysDepart(departmentTree, sysDepart); 236 SysDepart updateSysDepart = this.qwDepartmentToSysDepart(departmentTree, sysDepart);
237 if (sysParentId != null) { 237 if (sysParentId != null) {
238 - updateSysDepart.setParentId(sysParentId); 238 + updateSysDepart.setParentId(Integer.valueOf(sysParentId));
239 } 239 }
240 try { 240 try {
241 sysDepartService.updateDepartDataById(updateSysDepart, username); 241 sysDepartService.updateDepartDataById(updateSysDepart, username);
@@ -246,13 +246,13 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { @@ -246,13 +246,13 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
246 } 246 }
247 if (departmentTree.hasChildren()) { 247 if (departmentTree.hasChildren()) {
248 // 紧接着同步子级 248 // 紧接着同步子级
249 - this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), updateSysDepart.getId(), username, syncInfo); 249 + this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), updateSysDepart.getId().toString(), username, syncInfo);
250 } 250 }
251 } else { 251 } else {
252 // 执行新增操作 252 // 执行新增操作
253 SysDepart newSysDepart = this.qwDepartmentToSysDepart(departmentTree, null); 253 SysDepart newSysDepart = this.qwDepartmentToSysDepart(departmentTree, null);
254 if (sysParentId != null) { 254 if (sysParentId != null) {
255 - newSysDepart.setParentId(sysParentId); 255 + newSysDepart.setParentId(Integer.valueOf(sysParentId));
256 // 2 = 组织机构 256 // 2 = 组织机构
257 newSysDepart.setOrgCategory("2"); 257 newSysDepart.setOrgCategory("2");
258 } else { 258 } else {
@@ -268,7 +268,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { @@ -268,7 +268,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
268 } 268 }
269 // 紧接着同步子级 269 // 紧接着同步子级
270 if (departmentTree.hasChildren()) { 270 if (departmentTree.hasChildren()) {
271 - this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), newSysDepart.getId(), username, syncInfo); 271 + this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), newSysDepart.getId().toString(), username, syncInfo);
272 } 272 }
273 } 273 }
274 } 274 }
@@ -314,7 +314,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { @@ -314,7 +314,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
314 * 2. 本地表里没有，就先用手机号判断，不通过再用username判断。 314 * 2. 本地表里没有，就先用手机号判断，不通过再用username判断。
315 */ 315 */
316 User qwUser; 316 User qwUser;
317 - SysThirdAccount sysThirdAccount = sysThirdAccountService.getOneBySysUserId(sysUser.getId(), THIRD_TYPE); 317 + SysThirdAccount sysThirdAccount = sysThirdAccountService.getOneBySysUserId(sysUser.getId().toString(), THIRD_TYPE);
318 for (User qwUserTemp : qwUsers) { 318 for (User qwUserTemp : qwUsers) {
319 if (sysThirdAccount == null || oConvertUtils.isEmpty(sysThirdAccount.getThirdUserId()) || !sysThirdAccount.getThirdUserId().equals(qwUserTemp.getUserid())) { 319 if (sysThirdAccount == null || oConvertUtils.isEmpty(sysThirdAccount.getThirdUserId()) || !sysThirdAccount.getThirdUserId().equals(qwUserTemp.getUserid())) {
320 // sys_third_account 表匹配失败，尝试用手机号匹配 320 // sys_third_account 表匹配失败，尝试用手机号匹配
@@ -333,7 +333,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { @@ -333,7 +333,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
333 int errCode = JwUserAPI.updateUser(qwUser, accessToken); 333 int errCode = JwUserAPI.updateUser(qwUser, accessToken);
334 // 收集错误信息 334 // 收集错误信息
335 this.syncUserCollectErrInfo(errCode, sysUser, syncInfo); 335 this.syncUserCollectErrInfo(errCode, sysUser, syncInfo);
336 - this.thirdAccountSaveOrUpdate(sysThirdAccount, sysUser.getId(), qwUser.getUserid()); 336 + this.thirdAccountSaveOrUpdate(sysThirdAccount, sysUser.getId().toString(), qwUser.getUserid());
337 // 更新完成，直接跳到下一次外部循环继续 337 // 更新完成，直接跳到下一次外部循环继续
338 continue for1; 338 continue for1;
339 } 339 }
@@ -343,7 +343,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { @@ -343,7 +343,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
343 // 收集错误信息 343 // 收集错误信息
344 boolean apiSuccess = this.syncUserCollectErrInfo(errCode, sysUser, syncInfo); 344 boolean apiSuccess = this.syncUserCollectErrInfo(errCode, sysUser, syncInfo);
345 if (apiSuccess) { 345 if (apiSuccess) {
346 - this.thirdAccountSaveOrUpdate(sysThirdAccount, sysUser.getId(), qwUser.getUserid()); 346 + this.thirdAccountSaveOrUpdate(sysThirdAccount, sysUser.getId().toString(), qwUser.getUserid());
347 } 347 }
348 } 348 }
349 return syncInfo; 349 return syncInfo;
@@ -388,7 +388,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { @@ -388,7 +388,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
388 this.syncUserCollectErrInfo(e, qwUser, syncInfo); 388 this.syncUserCollectErrInfo(e, qwUser, syncInfo);
389 } 389 }
390 390
391 - this.thirdAccountSaveOrUpdate(sysThirdAccount, updateSysUser.getId(), qwUser.getUserid()); 391 + this.thirdAccountSaveOrUpdate(sysThirdAccount, updateSysUser.getId().toString(), qwUser.getUserid());
392 // 更新完成，直接跳到下一次外部循环继续 392 // 更新完成，直接跳到下一次外部循环继续
393 }else{ 393 }else{
394 // 没匹配到用户则走新增逻辑 394 // 没匹配到用户则走新增逻辑
@@ -400,7 +400,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { @@ -400,7 +400,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
400 } catch (Exception e) { 400 } catch (Exception e) {
401 this.syncUserCollectErrInfo(e, qwUser, syncInfo); 401 this.syncUserCollectErrInfo(e, qwUser, syncInfo);
402 } 402 }
403 - this.thirdAccountSaveOrUpdate(sysThirdAccount, newSysUser.getId(), qwUser.getUserid()); 403 + this.thirdAccountSaveOrUpdate(sysThirdAccount, newSysUser.getId().toString(), qwUser.getUserid());
404 } 404 }
405 } 405 }
406 return syncInfo; 406 return syncInfo;
@@ -581,7 +581,11 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { @@ -581,7 +581,11 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
581 } 581 }
582 // 根据用户部门 582 // 根据用户部门
583 LambdaQueryWrapper<SysDepart> departQueryWrapper = new LambdaQueryWrapper<>(); 583 LambdaQueryWrapper<SysDepart> departQueryWrapper = new LambdaQueryWrapper<>();
584 - List<String> departIdList = sysUserDepartList.stream().map(SysUserDepart::getDepId).collect(Collectors.toList()); 584 + List<String> departIdList=new ArrayList<>();
  585 + for (SysUserDepart s : sysUserDepartList) {
  586 + departIdList.add(s.getId().toString());
  587 + }
  588 + //List<String> departIdList = sysUserDepartList.stream().map(SysUserDepart::getDepId).collect(Collectors.toList());
585 departQueryWrapper.in(SysDepart::getId, departIdList); 589 departQueryWrapper.in(SysDepart::getId, departIdList);
586 List<SysDepart> departList = sysDepartService.list(departQueryWrapper); 590 List<SysDepart> departList = sysDepartService.list(departQueryWrapper);
587 return departList.size() == 0 ? null : departList; 591 return departList.size() == 0 ? null : departList;
@@ -777,7 +781,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { @@ -777,7 +781,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
777 LambdaQueryWrapper<SysAnnouncementSend> queryWrapper = new LambdaQueryWrapper<>(); 781 LambdaQueryWrapper<SysAnnouncementSend> queryWrapper = new LambdaQueryWrapper<>();
778 queryWrapper.eq(SysAnnouncementSend::getAnntId, announcement.getId()); 782 queryWrapper.eq(SysAnnouncementSend::getAnntId, announcement.getId());
779 SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendMapper.selectOne(queryWrapper); 783 SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendMapper.selectOne(queryWrapper);
780 - userIds = new String[] {sysAnnouncementSend.getUserId()}; 784 + userIds = new String[] {String.valueOf(sysAnnouncementSend.getUserId())};
781 } 785 }
782 List<String> usernameList = sysUserService.userIdToUsername(Arrays.asList(userIds)); 786 List<String> usernameList = sysUserService.userIdToUsername(Arrays.asList(userIds));
783 usernameString = String.join(",", usernameList); 787 usernameString = String.join(",", usernameList);
@@ -876,7 +880,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { @@ -876,7 +880,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
876 thirdAccount.setRealname(appUser.getName()); 880 thirdAccount.setRealname(appUser.getName());
877 thirdAccount.setThirdUserId(appUser.getUserid()); 881 thirdAccount.setThirdUserId(appUser.getUserid());
878 thirdAccount.setThirdUserUuid(appUser.getUserid()); 882 thirdAccount.setThirdUserUuid(appUser.getUserid());
879 - thirdAccount.setSysUserId(sysUser.getId()); 883 + thirdAccount.setSysUserId(sysUser.getId().toString());
880 sysThirdAccountService.updateById(thirdAccount); 884 sysThirdAccountService.updateById(thirdAccount);
881 return sysUser; 885 return sysUser;
882 } else { 886 } else {