diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailHistoryList.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailHistoryList.vue
index cfa9875..1fcf674 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailHistoryList.vue
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailHistoryList.vue
@@ -131,11 +131,11 @@
align:"center",
dataIndex: 'shipmentCode'
},
- {
- title:'货主编码',
- align:"center",
- dataIndex: 'companyCode'
- },
+ // {
+ // title:'货主编码',
+ // align:"center",
+ // dataIndex: 'companyCode'
+ // },
{
title:'物料编码',
align:"center",
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java
index 8d57e23..9e7f754 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java
@@ -25,7 +25,7 @@ public class LogDTO implements Serializable {
/**登录用户 */
private LoginUser loginUser;
- private String id;
+ private Integer id;
private String createBy;
private Date createTime;
private Long costTime;
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
index c40f2e6..02f0bc9 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
@@ -26,7 +26,7 @@ public class LoginUser {
/**
* 登录人id
*/
- private String id;
+ private Integer id;
/**
* 登录人账号
@@ -78,7 +78,7 @@ public class LoginUser {
* 状态(1：正常 2：冻结 ）
*/
private Integer status;
-
+
private Integer delFlag;
/**
* 同步工作流引擎1同步0不同步
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java
index f9204d6..e0999e7 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java
@@ -27,7 +27,7 @@ public class SysPermissionDataRuleModel {
/**
* 对应的菜单id
*/
- private String permissionId;
+ private Integer permissionId;
/**
* 规则名称
@@ -69,6 +69,14 @@ public class SysPermissionDataRuleModel {
*/
private String updateBy;
+ public Integer getPermissionId() {
+ return permissionId;
+ }
+
+ public void setPermissionId(Integer permissionId) {
+ this.permissionId = permissionId;
+ }
+
public String getId() {
return id;
}
@@ -77,13 +85,6 @@ public class SysPermissionDataRuleModel {
this.id = id;
}
- public String getPermissionId() {
- return permissionId;
- }
-
- public void setPermissionId(String permissionId) {
- this.permissionId = permissionId;
- }
public String getRuleName() {
return ruleName;
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java
index 7c105b7..d984f1a 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java
@@ -31,9 +31,9 @@ public class BaseCommonServiceImpl implements BaseCommonService {
@Override
public void addLog(LogDTO logDTO) {
- if(oConvertUtils.isEmpty(logDTO.getId())){
- logDTO.setId(String.valueOf(IdWorker.getId()));
- }
+ //if(oConvertUtils.isEmpty(logDTO.getId())){
+ // logDTO.setId(String.valueOf(IdWorker.getId()));
+ //}
//保存日志（异常捕获处理，防止数据太大存储失败，导致业务失败）JT-238
try {
baseCommonMapper.saveLog(logDTO);
@@ -46,7 +46,7 @@ public class BaseCommonServiceImpl implements BaseCommonService {
@Override
public void addLog(String logContent, Integer logType, Integer operatetype, LoginUser user) {
LogDTO sysLog = new LogDTO();
- sysLog.setId(String.valueOf(IdWorker.getId()));
+ //sysLog.setId(String.valueOf(IdWorker.getId()));
//注解上的描述,操作日志内容
sysLog.setLogContent(logContent);
sysLog.setLogType(logType);
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java
index 86760e6..8d9463c 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java
@@ -30,7 +30,7 @@ import java.util.List;
public class JeecgDemoServiceImpl extends ServiceImpl<JeecgDemoMapper, JeecgDemo> implements IJeecgDemoService {
@Autowired
JeecgDemoMapper jeecgDemoMapper;
-
+
/**
* 事务控制在service层面
* 加上注解：@Transactional，声明的方法就是一个独立的事务（有异常DB操作全部回滚）
@@ -42,14 +42,14 @@ public class JeecgDemoServiceImpl extends ServiceImpl<JeecgDemoMapper, JeecgDemo
pp.setAge(1111);
pp.setName("测试事务 小白兔 1");
jeecgDemoMapper.insert(pp);
-
+
JeecgDemo pp2 = new JeecgDemo();
pp2.setAge(2222);
pp2.setName("测试事务 小白兔 2");
jeecgDemoMapper.insert(pp2);
-
+
Integer.parseInt("hello");//自定义异常
-
+
JeecgDemo pp3 = new JeecgDemo();
pp3.setAge(3333);
pp3.setName("测试事务 小白兔 3");
@@ -90,7 +90,7 @@ public class JeecgDemoServiceImpl extends ServiceImpl<JeecgDemoMapper, JeecgDemo
//查询配置菜单有效字段
List<String> allAuth = this.jeecgDemoMapper.queryAllAuth(permsPrefix);
//查询已授权字段
- List<String> userAuth = this.jeecgDemoMapper.queryUserAuth(sysUser.getId(),permsPrefix);
+ List<String> userAuth = this.jeecgDemoMapper.queryUserAuth(sysUser.getId().toString(),permsPrefix);
//列出未授权字段
for(String perms : allAuth){
if(!userAuth.contains(perms)){
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java
index 4da744a..3824e27 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java
@@ -51,11 +51,11 @@ public class CasClientController {
private ISysDepartService sysDepartService;
@Autowired
private RedisUtil redisUtil;
-
+
@Value("${cas.prefixUrl}")
private String prefixUrl;
-
-
+
+
@GetMapping("/validateLogin")
public Object validateLogin(@RequestParam(name="ticket") String ticket,
@RequestParam(name="service") String service,
@@ -89,7 +89,7 @@ public class CasClientController {
//获取用户部门信息
JSONObject obj = new JSONObject();
- List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
+ List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId().toString());
obj.put("departs", departs);
if (departs == null || departs.size() == 0) {
obj.put("multi_depart", 0);
@@ -103,7 +103,7 @@ public class CasClientController {
obj.put("userInfo", sysUser);
result.setResult(obj);
result.success("登录成功");
-
+
} catch (Exception e) {
//e.printStackTrace();
result.error500(e.getMessage());
@@ -111,5 +111,5 @@ public class CasClientController {
return new HttpEntity<>(result);
}
-
+
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java
index d2786b5..7faf2f8 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java
@@ -80,7 +80,7 @@ public class NgAlainServiceImpl implements NgAlainService {
if(permission.getMenuType()==null) {
continue;
}
- String tempPid = permission.getParentId();
+ String tempPid = String.valueOf(permission.getParentId());
JSONObject json = getPermissionJsonObject(permission);
if(parentJson==null && oConvertUtils.isEmpty(tempPid)) {
jsonArray.add(json);
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
index b6a1dcc..16f97b2 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
@@ -397,7 +397,7 @@ public class LoginController {
String username = sysUser.getUsername();
// 获取用户部门信息
JSONObject obj = new JSONObject();
- List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
+ List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId().toString());
obj.put("departs", departs);
if (departs == null || departs.size() == 0) {
obj.put("multi_depart", 0);
@@ -519,7 +519,7 @@ public class LoginController {
String orgCode = sysUser.getOrgCode();
if(oConvertUtils.isEmpty(orgCode)) {
//如果当前用户无选择部门 查看部门关联信息
- List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
+ List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId().toString());
//update-begin-author:taoyan date:20220117 for: JTC-1068【app】新建用户，没有设置部门及角色，点击登录提示暂未归属部，一直在登录页面 使用手机号登录 可正常
if (departs == null || departs.size() == 0) {
/*result.error500("用户暂未归属部门,不可登录!");
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
index 8a9680c..6f3f8cc 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
@@ -261,8 +261,8 @@ public class SysAnnouncementController {
// 2.插入用户通告阅读标记表记录
String userId = sysAnnouncement.getUserIds();
String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
- String anntId = sysAnnouncement.getId();
- Date refDate = new Date();
+ //String anntId = sysAnnouncement.getId();
+ //Date refDate = new Date();
JSONObject obj = new JSONObject();
obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER);
obj.put(WebsocketConst.MSG_ID, sysAnnouncement.getId());
@@ -326,7 +326,7 @@ public class SysAnnouncementController {
public Result<Map<String, Object>> listByUser(@RequestParam(required = false, defaultValue = "5") Integer pageSize) {
Result<Map<String,Object>> result = new Result<Map<String,Object>>();
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
- String userId = sysUser.getId();
+ String userId = sysUser.getId().toString();
// 1.将系统消息补充到用户通告阅读标记表中
LambdaQueryWrapper<SysAnnouncement> querySaWrapper = new LambdaQueryWrapper<SysAnnouncement>();
querySaWrapper.eq(SysAnnouncement::getMsgType,CommonConstant.MSG_TYPE_ALL); // 全部人员
@@ -349,7 +349,7 @@ public class SysAnnouncementController {
log.info("listByUser接口新增了SysAnnouncementSend：pageSize{}："+pageSize);
SysAnnouncementSend announcementSend = new SysAnnouncementSend();
announcementSend.setAnntId(announcements.get(i).getId());
- announcementSend.setUserId(userId);
+ announcementSend.setUserId(Integer.valueOf(userId));
announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
sysAnnouncementSendService.save(announcementSend);
log.info("announcementSend.toString()",announcementSend.toString());
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
index ac2087c..06997ed 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
@@ -91,7 +91,7 @@ public class SysAnnouncementSendController {
result.setResult(pageList);
return result;
}
-
+
/**
* 添加
* @param sysAnnouncementSend
@@ -109,7 +109,7 @@ public class SysAnnouncementSendController {
}
return result;
}
-
+
/**
* 编辑
* @param sysAnnouncementSend
@@ -128,10 +128,10 @@ public class SysAnnouncementSendController {
result.success("修改成功!");
}
}
-
+
return result;
}
-
+
/**
* 通过id删除
* @param id
@@ -149,10 +149,10 @@ public class SysAnnouncementSendController {
result.success("删除成功!");
}
}
-
+
return result;
}
-
+
/**
* 批量删除
* @param ids
@@ -169,7 +169,7 @@ public class SysAnnouncementSendController {
}
return result;
}
-
+
/**
* 通过id查询
* @param id
@@ -187,7 +187,7 @@ public class SysAnnouncementSendController {
}
return result;
}
-
+
/**
* @功能：更新用户系统消息阅读状态
* @param json
@@ -198,7 +198,7 @@ public class SysAnnouncementSendController {
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
String anntId = json.getString("anntId");
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
- String userId = sysUser.getId();
+ String userId = sysUser.getId().toString();
LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
@@ -208,7 +208,7 @@ public class SysAnnouncementSendController {
result.setSuccess(true);
return result;
}
-
+
/**
* @功能：获取我的消息
* @return
@@ -219,8 +219,8 @@ public class SysAnnouncementSendController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
Result<IPage<AnnouncementSendModel>> result = new Result<IPage<AnnouncementSendModel>>();
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
- String userId = sysUser.getId();
- announcementSendModel.setUserId(userId);
+ String userId = sysUser.getId().toString();
+ announcementSendModel.setUserId(Integer.valueOf(userId));
announcementSendModel.setPageNo((pageNo-1)*pageSize);
announcementSendModel.setPageSize(pageSize);
Page<AnnouncementSendModel> pageList = new Page<AnnouncementSendModel>(pageNo,pageSize);
@@ -238,7 +238,7 @@ public class SysAnnouncementSendController {
public Result<SysAnnouncementSend> readAll() {
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
- String userId = sysUser.getId();
+ String userId = sysUser.getId().toString();
LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java
index 60bada8..f4ebf0b 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java
@@ -47,7 +47,7 @@ import java.util.stream.Collectors;
public class SysCategoryController {
@Autowired
private ISysCategoryService sysCategoryService;
-
+
/**
* 分页列表查询
* @param sysCategory
@@ -65,7 +65,7 @@ public class SysCategoryController {
sysCategory.setPid("0");
}
Result<IPage<SysCategory>> result = new Result<IPage<SysCategory>>();
-
+
//--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------start
//--author:liusq---date:20211119 -----for: 【vue3】分类字典页面查询条件配置--------start
QueryWrapper<SysCategory> queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, req.getParameterMap());
@@ -84,7 +84,7 @@ public class SysCategoryController {
result.setResult(pageList);
return result;
}
-
+
@GetMapping(value = "/childList")
public Result<List<SysCategory>> queryPageList(SysCategory sysCategory,HttpServletRequest req) {
Result<List<SysCategory>> result = new Result<List<SysCategory>>();
@@ -94,8 +94,8 @@ public class SysCategoryController {
result.setResult(list);
return result;
}
-
-
+
+
/**
* 添加
* @param sysCategory
@@ -113,7 +113,7 @@ public class SysCategoryController {
}
return result;
}
-
+
/**
* 编辑
* @param sysCategory
@@ -131,7 +131,7 @@ public class SysCategoryController {
}
return result;
}
-
+
/**
* 通过id删除
* @param id
@@ -147,10 +147,10 @@ public class SysCategoryController {
this.sysCategoryService.deleteSysCategory(id);
result.success("删除成功!");
}
-
+
return result;
}
-
+
/**
* 批量删除
* @param ids
@@ -167,7 +167,7 @@ public class SysCategoryController {
}
return result;
}
-
+
/**
* 通过id查询
* @param id
@@ -283,9 +283,9 @@ public class SysCategoryController {
}
return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage);
}
-
-
-
+
+
+
/**
* 加载单个数据 用于回显
*/
@@ -293,7 +293,7 @@ public class SysCategoryController {
public Result<SysCategory> loadOne(@RequestParam(name="field") String field,@RequestParam(name="val") String val) {
Result<SysCategory> result = new Result<SysCategory>();
try {
-
+
QueryWrapper<SysCategory> query = new QueryWrapper<SysCategory>();
query.eq(field, val);
List<SysCategory> ls = this.sysCategoryService.list(query);
@@ -314,7 +314,7 @@ public class SysCategoryController {
}
return result;
}
-
+
/**
* 加载节点的子数据
*/
@@ -332,7 +332,7 @@ public class SysCategoryController {
}
return result;
}
-
+
/**
* 加载一级节点/如果是同步 则所有数据
*/
@@ -353,7 +353,7 @@ public class SysCategoryController {
}
return result;
}
-
+
/**
* 递归求子节点 同步加载用到
*/
@@ -473,7 +473,7 @@ public class SysCategoryController {
}
List<DictModel> rdList = new ArrayList<DictModel>();
for (SysCategory c : list) {
- rdList.add(new DictModel(c.getId(),c.getName()));
+ rdList.add(new DictModel(c.getId().toString(),c.getName()));
}
result.setSuccess(true);
result.setResult(rdList);
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
index 3df03e7..7190ce8 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
@@ -45,7 +45,7 @@ import java.util.*;
* <p>
* 部门表 前端控制器
* <p>
- *
+ *
* @Author: Steve @Since： 2019-01-22
*/
@RestController
@@ -93,7 +93,7 @@ public class SysDepartController {
/**
* 查询数据 查出所有部门,并以树结构数据格式响应给前端
- *
+ *
* @return
*/
@RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
@@ -167,7 +167,7 @@ public class SysDepartController {
/**
* 添加新数据 添加用户新建的部门对象数据,并保存到数据库
- *
+ *
* @param sysDepart
* @return
*/
@@ -193,7 +193,7 @@ public class SysDepartController {
/**
* 编辑数据 编辑部门的部分数据,并保存到数据库
- *
+ *
* @param sysDepart
* @return
*/
@@ -219,7 +219,7 @@ public class SysDepartController {
}
return result;
}
-
+
/**
* 通过id删除
* @param id
@@ -249,7 +249,7 @@ public class SysDepartController {
/**
* 批量删除 根据前端请求的多个ID,对数据库执行删除相关部门数据的操作
- *
+ *
* @param ids
* @return
*/
@@ -270,7 +270,7 @@ public class SysDepartController {
/**
* 查询数据 添加或编辑页面对该方法发起请求,以树结构形式加载所有部门的名称,方便用户的操作
- *
+ *
* @return
*/
@RequestMapping(value = "/queryIdTree", method = RequestMethod.GET)
@@ -304,12 +304,12 @@ public class SysDepartController {
}
return result;
}
-
+
/**
* <p>
* 部门搜索功能方法,根据关键字模糊搜索相关部门
* </p>
- *
+ *
* @param keyWord
* @return
*/
@@ -408,13 +408,13 @@ public class SysDepartController {
if(!parentDept.equals(null)) {
sysDepart.setParentId(parentDept.getId());
} else {
- sysDepart.setParentId("");
+ sysDepart.setParentId(0);
}
}catch (Exception e) {
//没有查找到parentDept
}
}else{
- sysDepart.setParentId("");
+ sysDepart.setParentId(0);
}
//update-begin---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------
sysDepart.setOrgType(sysDepart.getOrgCode().length()/codeLength+"");
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java
index 7ca751f..b026b38 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java
@@ -76,7 +76,7 @@ public class SysDepartPermissionController extends JeecgController<SysDepartPerm
IPage<SysDepartPermission> pageList = sysDepartPermissionService.page(page, queryWrapper);
return Result.ok(pageList);
}
-
+
/**
* 添加
*
@@ -89,7 +89,7 @@ public class SysDepartPermissionController extends JeecgController<SysDepartPerm
sysDepartPermissionService.save(sysDepartPermission);
return Result.ok("添加成功！");
}
-
+
/**
* 编辑
*
@@ -102,7 +102,7 @@ public class SysDepartPermissionController extends JeecgController<SysDepartPerm
sysDepartPermissionService.updateById(sysDepartPermission);
return Result.ok("编辑成功!");
}
-
+
/**
* 通过id删除
*
@@ -115,7 +115,7 @@ public class SysDepartPermissionController extends JeecgController<SysDepartPerm
sysDepartPermissionService.removeById(id);
return Result.ok("删除成功!");
}
-
+
/**
* 批量删除
*
@@ -128,7 +128,7 @@ public class SysDepartPermissionController extends JeecgController<SysDepartPerm
this.sysDepartPermissionService.removeByIds(Arrays.asList(ids.split(",")));
return Result.ok("批量删除成功！");
}
-
+
/**
* 通过id查询
*
@@ -278,7 +278,7 @@ public class SysDepartPermissionController extends JeecgController<SysDepartPerm
query.inSql(SysPermission::getId,"select permission_id from sys_depart_permission where depart_id='"+departId+"'");
List<SysPermission> list = sysPermissionService.list(query);
for(SysPermission sysPer : list) {
- ids.add(sysPer.getId());
+ ids.add(sysPer.getId().toString());
}
List<TreeModel> treeList = new ArrayList<>();
getTreeModelList(treeList, list, null);
@@ -295,8 +295,8 @@ public class SysDepartPermissionController extends JeecgController<SysDepartPerm
private void getTreeModelList(List<TreeModel> treeList, List<SysPermission> metaList, TreeModel temp) {
for (SysPermission permission : metaList) {
- String tempPid = permission.getParentId();
- TreeModel tree = new TreeModel(permission.getId(), tempPid, permission.getName(),permission.getRuleFlag(), permission.isLeaf());
+ String tempPid = String.valueOf(permission.getParentId());
+ TreeModel tree = new TreeModel(permission.getId().toString(), tempPid, permission.getName(),permission.getRuleFlag(), permission.isLeaf());
if(temp==null && oConvertUtils.isEmpty(tempPid)) {
treeList.add(tree);
if(!tree.getIsLeaf()) {
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
index 383d027..bc17495 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
@@ -54,7 +54,7 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
@Autowired
private ISysDepartService sysDepartService;
-
+
/**
* 分页列表查询
*
@@ -91,7 +91,7 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
IPage<SysDepartRole> pageList = sysDepartRoleService.page(page, queryWrapper);
return Result.ok(pageList);
}
-
+
/**
* 添加
*
@@ -105,7 +105,7 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
sysDepartRoleService.save(sysDepartRole);
return Result.ok("添加成功！");
}
-
+
/**
* 编辑
*
@@ -119,7 +119,7 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
sysDepartRoleService.updateById(sysDepartRole);
return Result.ok("编辑成功!");
}
-
+
/**
* 通过id删除
*
@@ -134,7 +134,7 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
sysDepartRoleService.removeById(id);
return Result.ok("删除成功!");
}
-
+
/**
* 批量删除
*
@@ -149,7 +149,7 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(",")));
return Result.ok("批量删除成功！");
}
-
+
/**
* 通过id查询
*
@@ -203,7 +203,10 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
Result<List<SysDepartRoleUser>> result = new Result<>();
//查询部门下角色
List<SysDepartRole> roleList = sysDepartRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",departId));
- List<String> roleIds = roleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
+ List<String> roleIds=new ArrayList<>();
+ for (SysDepartRole role : roleList) {
+ roleIds.add(role.getId().toString());
+ }
//根据角色id,用户id查询已授权角色
List<SysDepartRoleUser> roleUserList = null;
if(roleIds!=null && roleIds.size()>0){
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
index edca33c..758a73c 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
@@ -462,7 +462,7 @@ public class SysDictController {
SysDictPage vo = new SysDictPage();
BeanUtils.copyProperties(dictMain, vo);
// 查询机票
- List<SysDictItem> sysDictItemList = sysDictItemService.selectItemsByMainId(dictMain.getId());
+ List<SysDictItem> sysDictItemList = sysDictItemService.selectItemsByMainId(dictMain.getId().toString());
vo.setSysDictItemList(sysDictItemList);
pageList.add(vo);
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java
index 611927e..af318f2 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java
@@ -45,7 +45,7 @@ public class SysDictItemController {
@Autowired
private ISysDictItemService sysDictItemService;
-
+
/**
* @功能：查询字典数据
* @param sysDictItem
@@ -66,7 +66,7 @@ public class SysDictItemController {
result.setResult(pageList);
return result;
}
-
+
/**
* @功能：新增
* @return
@@ -86,7 +86,7 @@ public class SysDictItemController {
}
return result;
}
-
+
/**
* @功能：编辑
* @param sysDictItem
@@ -110,7 +110,7 @@ public class SysDictItemController {
}
return result;
}
-
+
/**
* @功能：删除字典数据
* @param id
@@ -132,7 +132,7 @@ public class SysDictItemController {
}
return result;
}
-
+
/**
* @功能：批量删除字典数据
* @param ids
@@ -165,7 +165,7 @@ public class SysDictItemController {
LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>();
queryWrapper.eq(SysDictItem::getItemValue,sysDictItem.getItemValue());
queryWrapper.eq(SysDictItem::getDictId,sysDictItem.getDictId());
- if (StringUtils.isNotBlank(sysDictItem.getId())) {
+ if (sysDictItem.getId() != null && sysDictItem.getId().toString().length() > 0) {
// 编辑页面校验
queryWrapper.ne(SysDictItem::getId,sysDictItem.getId());
}
@@ -179,5 +179,5 @@ public class SysDictItemController {
return Result.error("该值不可用，系统中已存在！");
}
}
-
+
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
index 1e6caf1..b47688f 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
@@ -159,7 +159,7 @@ public class SysPermissionController {
List<SysPermission> list = sysPermissionService.list(query);
Map<String, List<SysPermissionTree>> listMap = new HashMap<>();
for (SysPermission item : list) {
- String pid = item.getParentId();
+ String pid = String.valueOf(item.getParentId());
if (parentIdList.contains(pid)) {
List<SysPermissionTree> mapList = listMap.get(pid);
if (mapList == null) {
@@ -410,7 +410,7 @@ public class SysPermissionController {
query.orderByAsc(SysPermission::getSortNo);
List<SysPermission> list = sysPermissionService.list(query);
for (SysPermission sysPer : list) {
- ids.add(sysPer.getId());
+ ids.add(sysPer.getId().toString());
}
List<TreeModel> treeList = new ArrayList<>();
getTreeModelList(treeList, list, null);
@@ -493,7 +493,7 @@ public class SysPermissionController {
private void getTreeList(List<SysPermissionTree> treeList, List<SysPermission> metaList, SysPermissionTree temp) {
for (SysPermission permission : metaList) {
- String tempPid = permission.getParentId();
+ String tempPid = String.valueOf(permission.getParentId());
SysPermissionTree tree = new SysPermissionTree(permission);
if (temp == null && oConvertUtils.isEmpty(tempPid)) {
treeList.add(tree);
@@ -512,7 +512,7 @@ public class SysPermissionController {
private void getTreeModelList(List<TreeModel> treeList, List<SysPermission> metaList, TreeModel temp) {
for (SysPermission permission : metaList) {
- String tempPid = permission.getParentId();
+ String tempPid = String.valueOf(permission.getParentId());
TreeModel tree = new TreeModel(permission);
if (temp == null && oConvertUtils.isEmpty(tempPid)) {
treeList.add(tree);
@@ -603,7 +603,7 @@ public class SysPermissionController {
if (permission.getMenuType() == null) {
continue;
}
- String tempPid = permission.getParentId();
+ String tempPid = String.valueOf(permission.getParentId());
JSONObject json = getPermissionJsonObject(permission);
if(json==null) {
continue;
@@ -781,7 +781,7 @@ public class SysPermissionController {
*/
@RequestMapping(value = "/getPermRuleListByPermId", method = RequestMethod.GET)
public Result<List<SysPermissionDataRule>> getPermRuleListByPermId(SysPermissionDataRule sysPermissionDataRule) {
- List<SysPermissionDataRule> permRuleList = sysPermissionDataRuleService.getPermRuleListByPermId(sysPermissionDataRule.getPermissionId());
+ List<SysPermissionDataRule> permRuleList = sysPermissionDataRuleService.getPermRuleListByPermId(sysPermissionDataRule.getPermissionId().toString());
Result<List<SysPermissionDataRule>> result = new Result<>();
result.setSuccess(true);
result.setResult(permRuleList);
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
index 13c69c8..33e745c 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
@@ -71,13 +71,13 @@ import lombok.extern.slf4j.Slf4j;
public class SysRoleController {
@Autowired
private ISysRoleService sysRoleService;
-
+
@Autowired
private ISysPermissionDataRuleService sysPermissionDataRuleService;
-
+
@Autowired
private ISysRolePermissionService sysRolePermissionService;
-
+
@Autowired
private ISysPermissionService sysPermissionService;
@@ -102,7 +102,7 @@ public class SysRoleController {
result.setResult(pageList);
return result;
}
-
+
/**
* 添加
* @param role
@@ -122,7 +122,7 @@ public class SysRoleController {
}
return result;
}
-
+
/**
* 编辑
* @param role
@@ -143,10 +143,10 @@ public class SysRoleController {
result.success("修改成功!");
}
}
-
+
return result;
}
-
+
/**
* 通过id删除
* @param id
@@ -158,7 +158,7 @@ public class SysRoleController {
sysRoleService.deleteRole(id);
return Result.ok("删除角色成功");
}
-
+
/**
* 批量删除
* @param ids
@@ -176,7 +176,7 @@ public class SysRoleController {
}
return result;
}
-
+
/**
* 通过id查询
* @param id
@@ -194,7 +194,7 @@ public class SysRoleController {
}
return result;
}
-
+
@RequestMapping(value = "/queryall", method = RequestMethod.GET)
public Result<List<SysRole>> queryall() {
Result<List<SysRole>> result = new Result<>();
@@ -207,7 +207,7 @@ public class SysRoleController {
}
return result;
}
-
+
/**
* 校验角色编码唯一
*/
@@ -297,7 +297,7 @@ public class SysRoleController {
}
return Result.error("文件导入失败！");
}
-
+
/**
* 查询数据规则数据
*/
@@ -326,7 +326,7 @@ public class SysRoleController {
//TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key
}
}
-
+
/**
* 保存数据规则至角色菜单关联表
*/
@@ -353,8 +353,8 @@ public class SysRoleController {
}
return Result.ok("保存成功!");
}
-
-
+
+
/**
* 用户角色授权功能，查询菜单权限树
* @param request
@@ -371,7 +371,7 @@ public class SysRoleController {
query.orderByAsc(SysPermission::getSortNo);
List<SysPermission> list = sysPermissionService.list(query);
for(SysPermission sysPer : list) {
- ids.add(sysPer.getId());
+ ids.add(sysPer.getId().toString());
}
List<TreeModel> treeList = new ArrayList<>();
getTreeModelList(treeList, list, null);
@@ -385,11 +385,11 @@ public class SysRoleController {
}
return result;
}
-
+
private void getTreeModelList(List<TreeModel> treeList,List<SysPermission> metaList,TreeModel temp) {
for (SysPermission permission : metaList) {
- String tempPid = permission.getParentId();
- TreeModel tree = new TreeModel(permission.getId(), tempPid, permission.getName(),permission.getRuleFlag(), permission.isLeaf());
+ String tempPid = String.valueOf(permission.getParentId());
+ TreeModel tree = new TreeModel(permission.getId().toString(), tempPid, permission.getName(),permission.getRuleFlag(), permission.isLeaf());
if(temp==null && oConvertUtils.isEmpty(tempPid)) {
treeList.add(tree);
if(!tree.getIsLeaf()) {
@@ -401,9 +401,9 @@ public class SysRoleController {
getTreeModelList(treeList, metaList, tree);
}
}
-
+
}
}
-
-
+
+
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index a6a12de..38116e3 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -63,7 +63,7 @@ import java.util.stream.Collectors;
public class SysUserController {
@Autowired
private ISysBaseAPI sysBaseAPI;
-
+
@Autowired
private ISysUserService sysUserService;
@@ -108,7 +108,7 @@ public class SysUserController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
-
+
//update-begin-Author:wangshuai--Date:20211119--for:【vue3】通过部门id查询用户，通过code查询id
//部门ID
String departId = req.getParameter("departId");
@@ -116,7 +116,12 @@ public class SysUserController {
LambdaQueryWrapper<SysUserDepart> query = new LambdaQueryWrapper<>();
query.eq(SysUserDepart::getDepId,departId);
List<SysUserDepart> list = sysUserDepartService.list(query);
- List<String> userIds = list.stream().map(SysUserDepart::getUserId).collect(Collectors.toList());
+
+ //List<String> userIds = list.stream().map(SysUserDepart::getUserId).collect(Collectors.toList());
+ List<String> userIds=new ArrayList<>();
+ for (SysUserDepart depart : list) {
+ userIds.add(depart.getId().toString());
+ }
queryWrapper.in("id",userIds);
}
//用户ID
@@ -142,7 +147,12 @@ public class SysUserController {
//批量查询用户的所属部门
//step.1 先拿到全部的 useids
//step.2 通过 useids，一次性查询用户的所属部门名字
- List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
+ //List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
+ List<String> userIds=new ArrayList<>();
+ for (SysUser u : pageList.getRecords()) {
+ userIds.add(u.getId().toString());
+ }
+
if(userIds!=null && userIds.size()>0){
Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
pageList.getRecords().forEach(item->{
@@ -285,7 +295,7 @@ public class SysUserController {
result.error500("未找到用户相关角色信息");
} else {
for (SysUserRole sysUserRole : userRole) {
- list.add(sysUserRole.getRoleId());
+ list.add(sysUserRole.getRoleId().toString());
}
result.setSuccess(true);
result.setResult(list);
@@ -399,7 +409,11 @@ public class SysUserController {
//批量查询用户的所属部门
//step.1 先拿到全部的 useids
//step.2 通过 useids，一次性查询用户的所属部门名字
- List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
+ List<String> userIds=new ArrayList<>();
+ for (SysUser user : userList) {
+ userIds.add(user.getId().toString());
+ }
+ //List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
if(userIds!=null && userIds.size()>0){
Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
userList.forEach(item->{
@@ -528,11 +542,11 @@ public class SysUserController {
// 批量将部门和用户信息建立关联关系
String departIds = sysUserExcel.getDepartIds();
if (StringUtils.isNotBlank(departIds)) {
- String userId = sysUserExcel.getId();
+ String userId = sysUserExcel.getId().toString();
String[] departIdArray = departIds.split(",");
List<SysUserDepart> userDepartList = new ArrayList<>(departIdArray.length);
for (String departId : departIdArray) {
- userDepartList.add(new SysUserDepart(userId, departId));
+ userDepartList.add(new SysUserDepart(Integer.valueOf(userId), Integer.valueOf(departId)));
}
sysUserDepartService.saveBatch(userDepartList);
}
@@ -615,7 +629,7 @@ public class SysUserController {
try {
String sysRoleId = sysUserRoleVO.getRoleId();
for(String sysUserId:sysUserRoleVO.getUserIdList()) {
- SysUserRole sysUserRole = new SysUserRole(sysUserId,sysRoleId);
+ SysUserRole sysUserRole = new SysUserRole(Integer.valueOf(sysUserId),Integer.valueOf(sysRoleId));
QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<SysUserRole>();
queryWrapper.eq("role_id", sysRoleId).eq("user_id",sysUserId);
SysUserRole one = sysUserRoleService.getOne(queryWrapper);
@@ -708,7 +722,11 @@ public class SysUserController {
//批量查询用户的所属部门
//step.1 先拿到全部的 useids
//step.2 通过 useids，一次性查询用户的所属部门名字
- List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
+ List<String> userIds=new ArrayList<>();
+ for (SysUser s : pageList.getRecords()) {
+ userIds.add(s.getId().toString());
+ }
+ //List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
if(userIds!=null && userIds.size()>0){
Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
pageList.getRecords().forEach(item -> {
@@ -797,7 +815,7 @@ public class SysUserController {
try {
String sysDepId = sysDepartUsersVO.getDepId();
for(String sysUserId:sysDepartUsersVO.getUserIdList()) {
- SysUserDepart sysUserDepart = new SysUserDepart(null,sysUserId,sysDepId);
+ SysUserDepart sysUserDepart = new SysUserDepart(null,Integer.valueOf(sysUserId),Integer.valueOf(sysDepId));
QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>();
queryWrapper.eq("dep_id", sysDepId).eq("user_id",sysUserId);
SysUserDepart one = sysUserDepartService.getOne(queryWrapper);
@@ -831,7 +849,11 @@ public class SysUserController {
boolean b = sysUserDepartService.remove(queryWrapper);
if(b){
List<SysDepartRole> sysDepartRoleList = departRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",depId));
- List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
+ List<String> roleIds=new ArrayList<>();
+ for (SysDepartRole role : sysDepartRoleList) {
+ roleIds.add(role.getId().toString());
+ }
+ //List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
if(roleIds != null && roleIds.size()>0){
QueryWrapper<SysDepartRoleUser> query = new QueryWrapper<>();
query.eq("user_id",userId).in("drole_id",roleIds);
@@ -871,7 +893,7 @@ public class SysUserController {
}
return result;
}
-
+
/**
* 查询当前用户的所有部门/当前部门编码
* @return
@@ -881,7 +903,7 @@ public class SysUserController {
Result<Map<String,Object>> result = new Result<Map<String,Object>>();
try {
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
- List<SysDepart> list = this.sysDepartService.queryUserDeparts(sysUser.getId());
+ List<SysDepart> list = this.sysDepartService.queryUserDeparts(sysUser.getId().toString());
Map<String,Object> map = new HashMap<String,Object>();
map.put("list", list);
map.put("orgCode", sysUser.getOrgCode());
@@ -894,12 +916,12 @@ public class SysUserController {
return result;
}
-
+
/**
* 用户注册接口
- *
+ *
* @param jsonObject
* @param user
* @return
@@ -1037,7 +1059,7 @@ public class SysUserController {
result.setSuccess(true);
return result;
}
-
+
/**
* 用户更改密码
*/
@@ -1081,11 +1103,11 @@ public class SysUserController {
return result;
}
}
-
+
/**
* 根据TOKEN获取用户的部分信息（返回的数据是可供表单设计器使用的数据）
- *
+ *
* @return
*/
@GetMapping("/getUserSectionInfoByToken")
@@ -1096,7 +1118,7 @@ public class SysUserController {
if (oConvertUtils.isEmpty(token)) {
username = JwtUtil.getUserNameByToken(request);
} else {
- username = JwtUtil.getUsername(token);
+ username = JwtUtil.getUsername(token);
}
log.debug(" ------ 通过令牌获取部分用户信息，当前用户： " + username);
@@ -1117,7 +1139,7 @@ public class SysUserController {
return Result.error(500, "查询失败:" + e.getMessage());
}
}
-
+
/**
* 【APP端接口】获取用户列表 根据用户名和真实名 模糊匹配
* @param keyword
@@ -1154,7 +1176,7 @@ public class SysUserController {
log.error(e.getMessage(), e);
return Result.error(500, "查询失败:" + e.getMessage());
}
-
+
}
/**
@@ -1168,7 +1190,11 @@ public class SysUserController {
if (logicDeletedUserList.size() > 0) {
// 批量查询用户的所属部门
// step.1 先拿到全部的 userIds
- List<String> userIds = logicDeletedUserList.stream().map(SysUser::getId).collect(Collectors.toList());
+ List<String> userIds=new ArrayList<>();
+ for (SysUser user : logicDeletedUserList) {
+ userIds.add(user.getId().toString());
+ }
+ //List<String> userIds = logicDeletedUserList.stream().map(SysUser::getId).collect(Collectors.toList());
// step.2 通过 userIds，一次性查询用户的所属部门名字
Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
logicDeletedUserList.forEach(item -> item.setOrgCode(useDepNames.get(item.getId())));
@@ -1348,7 +1374,11 @@ public class SysUserController {
//批量查询用户的所属部门
//step.1 先拿到全部的 useids
//step.2 通过 useids，一次性查询用户的所属部门名字
- List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
+ List<String> userIds=new ArrayList<>();
+ for (SysUser user : pageList.getRecords()) {
+ userIds.add(user.getId().toString());
+ }
+ //List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
if(userIds!=null && userIds.size()>0){
Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
pageList.getRecords().forEach(item->{
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
index a4bc772..170afba 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
@@ -25,8 +25,8 @@ public class SysAnnouncement implements Serializable {
/**
* id
*/
- @TableId(type = IdType.ASSIGN_ID)
- private java.lang.String id;
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**
* 标题
*/
@@ -62,7 +62,7 @@ public class SysAnnouncement implements Serializable {
@Excel(name = "优先级", width = 15, dicCode = "priority")
@Dict(dicCode = "priority")
private java.lang.String priority;
-
+
/**
* 消息类型1:通知公告2:系统消息
*/
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java
index c9ea685..b22f8ea 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java
@@ -19,14 +19,16 @@ import org.springframework.format.annotation.DateTimeFormat;
@TableName("sys_announcement_send")
public class SysAnnouncementSend implements Serializable {
private static final long serialVersionUID = 1L;
-
- /**id*/
- @TableId(type = IdType.ASSIGN_ID)
- private java.lang.String id;
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**通告id*/
- private java.lang.String anntId;
+ private java.lang.Integer anntId;
/**用户id*/
- private java.lang.String userId;
+ private java.lang.Integer userId;
/**阅读状态（0未读，1已读）*/
private java.lang.String readFlag;
/**阅读时间*/
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java
index a287f35..8448540 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java
@@ -28,11 +28,10 @@ import java.util.Date;
public class SysCheckRule {
/**
- * 主键id
+ * id
*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "主键id")
- private String id;
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**
* 规则名称
*/
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java
index 6dd039d..37547fa 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java
@@ -18,9 +18,12 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
public class SysDataLog implements Serializable {
private static final long serialVersionUID = 1L;
-
- @TableId(type = IdType.ASSIGN_ID)
- private String id; //id'
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
private String createBy; //创建人登录名称
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java
index 0c21ad1..ee080b9 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java
@@ -29,9 +29,8 @@ public class SysDataSource {
/**
* id
*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "id")
- private java.lang.String id;
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**
* 数据源编码
*/
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
index c0a9481..8c5b113 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
@@ -17,7 +17,7 @@ import java.util.Objects;
* <p>
* 部门表
* <p>
- *
+ *
* @Author Steve
* @Since 2019-01-22
*/
@@ -25,12 +25,14 @@ import java.util.Objects;
@TableName("sys_depart")
public class SysDepart implements Serializable {
private static final long serialVersionUID = 1L;
-
- /**ID*/
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**父机构ID*/
- private String parentId;
+ private Integer parentId;
/**机构/部门名称*/
@Excel(name="机构/部门名称",width=15)
private String departName;
@@ -85,7 +87,7 @@ public class SysDepart implements Serializable {
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
-
+
/**
* 重写equals方法
*/
@@ -129,9 +131,9 @@ public class SysDepart implements Serializable {
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), id, parentId, departName,
- departNameEn, departNameAbbr, departOrder, description,orgCategory,
- orgType, orgCode, mobile, fax, address, memo, status,
+ return Objects.hash(super.hashCode(), id, parentId, departName,
+ departNameEn, departNameAbbr, departOrder, description,orgCategory,
+ orgType, orgCode, mobile, fax, address, memo, status,
delFlag, createBy, createTime, updateBy, updateTime);
}
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java
index a833af4..0298cac 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java
@@ -27,19 +27,20 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@Accessors(chain = true)
@ApiModel(value="sys_depart_permission对象", description="部门权限表")
public class SysDepartPermission {
-
- /**id*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "id")
- private java.lang.String id;
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**部门id*/
@Excel(name = "部门id", width = 15)
@ApiModelProperty(value = "部门id")
- private java.lang.String departId;
+ private java.lang.Integer departId;
/**权限id*/
@Excel(name = "权限id", width = 15)
@ApiModelProperty(value = "权限id")
- private java.lang.String permissionId;
+ private java.lang.Integer permissionId;
/**数据规则id*/
@ApiModelProperty(value = "数据规则id")
private java.lang.String dataRuleIds;
@@ -48,7 +49,7 @@ public class SysDepartPermission {
}
- public SysDepartPermission(String departId, String permissionId) {
+ public SysDepartPermission(Integer departId, Integer permissionId) {
this.departId = departId;
this.permissionId = permissionId;
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java
index cc3f74f..2c912da 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java
@@ -28,16 +28,17 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@Accessors(chain = true)
@ApiModel(value="sys_depart_role对象", description="部门角色")
public class SysDepartRole {
-
- /**id*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "id")
- private java.lang.String id;
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**部门id*/
@Excel(name = "部门id", width = 15)
@ApiModelProperty(value = "部门id")
@Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
- private java.lang.String departId;
+ private java.lang.Integer departId;
/**部门角色名称*/
@Excel(name = "部门角色名称", width = 15)
@ApiModelProperty(value = "部门角色名称")
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java
index 61b3fc2..1711623 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java
@@ -27,23 +27,24 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@Accessors(chain = true)
@ApiModel(value="sys_depart_role_permission对象", description="部门角色权限")
public class SysDepartRolePermission {
-
- /**id*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "id")
- private java.lang.String id;
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**部门id*/
@Excel(name = "部门id", width = 15)
@ApiModelProperty(value = "部门id")
- private java.lang.String departId;
+ private java.lang.Integer departId;
/**角色id*/
@Excel(name = "角色id", width = 15)
@ApiModelProperty(value = "角色id")
- private java.lang.String roleId;
+ private java.lang.Integer roleId;
/**权限id*/
@Excel(name = "权限id", width = 15)
@ApiModelProperty(value = "权限id")
- private java.lang.String permissionId;
+ private java.lang.Integer permissionId;
/**dataRuleIds*/
@Excel(name = "dataRuleIds", width = 15)
@ApiModelProperty(value = "dataRuleIds")
@@ -60,7 +61,7 @@ public class SysDepartRolePermission {
public SysDepartRolePermission() {
}
- public SysDepartRolePermission(String roleId, String permissionId) {
+ public SysDepartRolePermission(Integer roleId, Integer permissionId) {
this.roleId = roleId;
this.permissionId = permissionId;
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java
index 01316dc..5bc95cb 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java
@@ -27,25 +27,26 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@Accessors(chain = true)
@ApiModel(value="sys_depart_role_user对象", description="部门角色人员信息")
public class SysDepartRoleUser {
-
- /**主键id*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "主键id")
- private java.lang.String id;
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**用户id*/
@Excel(name = "用户id", width = 15)
@ApiModelProperty(value = "用户id")
- private java.lang.String userId;
+ private java.lang.Integer userId;
/**角色id*/
@Excel(name = "角色id", width = 15)
@ApiModelProperty(value = "角色id")
- private java.lang.String droleId;
+ private java.lang.Integer droleId;
public SysDepartRoleUser() {
}
- public SysDepartRoleUser(String userId, String droleId) {
+ public SysDepartRoleUser(Integer userId, Integer droleId) {
this.userId = userId;
this.droleId = droleId;
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDict.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDict.java
index eebd30a..063624b 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDict.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDict.java
@@ -29,9 +29,9 @@ public class SysDict implements Serializable {
/**
* id
*/
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
+
/**
* [预留字段，暂时无用]
* 字典类型,0 string,1 number类型,2 boolean
@@ -39,7 +39,7 @@ public class SysDict implements Serializable {
* 默认为string类型
*/
private Integer type;
-
+
/**
* 字典名称
*/
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java
index 3757eb2..b5a1715 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java
@@ -31,13 +31,13 @@ public class SysDictItem implements Serializable {
/**
* id
*/
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**
* 字典id
*/
- private String dictId;
+ private Integer dictId;
/**
* 字典项文本
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java
index 928ce01..933df7b 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java
@@ -26,11 +26,10 @@ import org.springframework.format.annotation.DateTimeFormat;
public class SysFillRule {
/**
- * 主键ID
+ * id
*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "主键ID")
- private java.lang.String id;
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**
* 规则名称
*/
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysLog.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysLog.java
index 0cf759a..0913fdb 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysLog.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysLog.java
@@ -30,8 +30,8 @@ public class SysLog implements Serializable {
/**
* id
*/
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**
* 创建人
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermission.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermission.java
index 8d8663f..5c58895 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermission.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermission.java
@@ -29,13 +29,13 @@ public class SysPermission implements Serializable {
/**
* id
*/
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**
* 父id
*/
- private String parentId;
+ private Integer parentId;
/**
* 菜单名称
@@ -60,7 +60,7 @@ public class SysPermission implements Serializable {
* 组件
*/
private String component;
-
+
/**
* 组件名字
*/
@@ -91,7 +91,7 @@ public class SysPermission implements Serializable {
*/
@TableField(value="is_leaf")
private boolean leaf;
-
+
/**
* 是否路由菜单: 0:不是 1:是（默认值1）
*/
@@ -119,12 +119,12 @@ public class SysPermission implements Serializable {
* 删除状态 0正常 1已删除
*/
private Integer delFlag;
-
+
/**
* 是否配置菜单的数据权限 1是0否 默认0
*/
private Integer ruleFlag;
-
+
/**
* 是否隐藏路由菜单: 0否,1是（默认值0）
*/
@@ -149,10 +149,10 @@ public class SysPermission implements Serializable {
* 更新时间
*/
private Date updateTime;
-
+
/**按钮权限状态(0无效1有效)*/
private java.lang.String status;
-
+
/**alwaysShow*/
private boolean alwaysShow;
@@ -162,12 +162,13 @@ public class SysPermission implements Serializable {
/*update_end author:wuxianquan date:20190908 for:实体增加字段 */
public SysPermission() {
-
+
}
public SysPermission(boolean index) {
if(index) {
- this.id = "9502685863ab87f0ad1134142788a385";
- this.name="首页";
+ //this.id = "9502685863ab87f0ad1134142788a385";
+ this.id = 1;
+ this.name="首页";
this.component="dashboard/Analysis";
this.componentName="dashboard-analysis";
this.url="/dashboard/analysis";
@@ -182,6 +183,6 @@ public class SysPermission implements Serializable {
this.leaf=true;
this.hidden=false;
}
-
+
}
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java
index 4a0af83..60c3b0e 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java
@@ -22,60 +22,60 @@ import lombok.experimental.Accessors;
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SysPermissionDataRule implements Serializable {
-
+
private static final long serialVersionUID = 1L;
-
+
/**
* id
*/
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
+
/**
* 对应的菜单id
*/
- private String permissionId;
-
+ private Integer permissionId;
+
/**
* 规则名称
*/
private String ruleName;
-
+
/**
* 字段
*/
private String ruleColumn;
-
+
/**
* 条件
*/
private String ruleConditions;
-
+
/**
* 规则值
*/
private String ruleValue;
-
+
/**
* 状态值 1有效 0无效
*/
private String status;
-
+
/**
* 创建时间
*/
private Date createTime;
-
+
/**
* 创建人
*/
private String createBy;
-
+
/**
* 修改时间
*/
private Date updateTime;
-
+
/**
* 修改人
*/
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPosition.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPosition.java
index ad113ab..436a8ed 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPosition.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPosition.java
@@ -29,9 +29,8 @@ public class SysPosition {
/**
* id
*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "id")
- private java.lang.String id;
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**
* 职务编码
*/
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRole.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRole.java
index a9c7ad9..90987de 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRole.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRole.java
@@ -33,21 +33,20 @@ public class SysRole implements Serializable {
/**
* id
*/
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**
* 角色名称
*/
@Excel(name="角色名",width=15)
private String roleName;
-
+
/**
* 角色编码
*/
@Excel(name="角色编码",width=15)
private String roleCode;
-
+
/**
* 描述
*/
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java
index f0a301d..30fd42f 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java
@@ -30,19 +30,19 @@ public class SysRolePermission implements Serializable {
/**
* id
*/
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
+
/**
* 角色id
*/
- private String roleId;
+ private Integer roleId;
/**
* 权限id
*/
- private String permissionId;
-
+ private Integer permissionId;
+
/**
* 数据权限
*/
@@ -62,8 +62,8 @@ public class SysRolePermission implements Serializable {
public SysRolePermission() {
}
-
- public SysRolePermission(String roleId, String permissionId) {
+
+ public SysRolePermission(Integer roleId, Integer permissionId) {
this.roleId = roleId;
this.permissionId = permissionId;
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysTenant.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysTenant.java
index a11a295..0463df6 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysTenant.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysTenant.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.system.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -19,15 +20,16 @@ public class SysTenant implements Serializable {
private static final long serialVersionUID = 1L;
/**
- * 编码
+ * id
*/
- private Integer id;
-
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
+
/**
* 名称
*/
private String name;
-
+
/**
* 创建人
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java
index d9a0ca1..07f630e 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java
@@ -24,11 +24,12 @@ import org.springframework.format.annotation.DateTimeFormat;
@Accessors(chain = true)
@ApiModel(value="sys_third_account对象", description="第三方登录账号表")
public class SysThirdAccount {
-
- /**编号*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "编号")
- private java.lang.String id;
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**第三方登录id*/
@Excel(name = "第三方登录id", width = 15)
@ApiModelProperty(value = "第三方登录id")
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java
index 74f7fc5..448df3a 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java
@@ -33,13 +33,11 @@ import lombok.experimental.Accessors;
public class SysUser implements Serializable {
private static final long serialVersionUID = 1L;
-
/**
* id
*/
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**
* 登录账号
*/
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java
index f443f5d..bf88fae 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java
@@ -20,10 +20,12 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@TableName("sys_user_agent")
public class SysUserAgent implements Serializable {
private static final long serialVersionUID = 1L;
-
- /**序号*/
- @TableId(type = IdType.ASSIGN_ID)
- private java.lang.String id;
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**用户名*/
@Excel(name = "用户名", width = 15)
private java.lang.String userName;
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java
index 446d558..364d7bc 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java
@@ -11,22 +11,24 @@ import lombok.Data;
@TableName("sys_user_depart")
public class SysUserDepart implements Serializable {
private static final long serialVersionUID = 1L;
-
- /**主键id*/
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
/**用户id*/
- private String userId;
+ private Integer userId;
/**部门id*/
- private String depId;
- public SysUserDepart(String id, String userId, String depId) {
+ private Integer depId;
+ public SysUserDepart(Integer id, Integer userId, Integer depId) {
super();
this.id = id;
this.userId = userId;
this.depId = depId;
}
- public SysUserDepart(String id, String departId) {
+ public SysUserDepart(Integer id, Integer departId) {
this.userId = id;
this.depId = departId;
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java
index 0391f62..08dad54 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java
@@ -24,27 +24,30 @@ public class SysUserRole implements Serializable {
private static final long serialVersionUID = 1L;
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
+ /**
+ * id
+ */
+ @TableId(type = IdType.AUTO)
+ private java.lang.Integer id;
+
/**
* 用户id
*/
- private String userId;
+ private Integer userId;
/**
* 角色id
*/
- private String roleId;
+ private Integer roleId;
public SysUserRole() {
}
- public SysUserRole(String userId, String roleId) {
+ public SysUserRole(Integer userId, Integer roleId) {
this.userId = userId;
this.roleId = roleId;
}
-
+
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml
index b338ebc..405efed 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.system.mapper.SysAnnouncementMapper">
<resultMap id="SysAnnouncement" type="org.jeecg.modules.system.entity.SysAnnouncement" >
- <result column="id" property="id" jdbcType="VARCHAR"/>
+ <result column="id" property="id" jdbcType="INTEGER"/>
<result column="titile" property="titile" jdbcType="VARCHAR"/>
<result column="msg_content" property="msgContent" jdbcType="VARCHAR"/>
<result column="start_time" property="startTime" jdbcType="TIMESTAMP"/>
@@ -26,15 +26,15 @@
<result column="open_type" property="openType" jdbcType="VARCHAR"/>
<result column="open_page" property="openPage" jdbcType="VARCHAR"/>
</resultMap>
-
-
+
+
<select id="querySysCementListByUserId" parameterType="String" resultMap="SysAnnouncement">
- select * from sys_announcement
- where send_status = '1'
- and del_flag = '0'
- and msg_category = #{msgCategory}
+ select * from sys_announcement
+ where send_status = '1'
+ and del_flag = '0'
+ and msg_category = #{msgCategory}
and id IN ( select annt_id from sys_announcement_send where user_id = #{userId} and read_flag = '0')
order by create_time DESC
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
index 6fda72c..f364d49 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.system.mapper.SysAnnouncementSendMapper">
-
+
<resultMap id="AnnouncementSendModel" type="org.jeecg.modules.system.model.AnnouncementSendModel" >
- <result column="id" property="id" jdbcType="VARCHAR"/>
+ <result column="id" property="id" jdbcType="INTEGER"/>
<result column="annt_id" property="anntId" jdbcType="VARCHAR"/>
<result column="user_id" property="userId" jdbcType="VARCHAR"/>
<result column="titile" property="titile" jdbcType="VARCHAR"/>
@@ -16,12 +16,12 @@
<result column="open_type" property="openType" jdbcType="VARCHAR"/>
<result column="open_page" property="openPage" jdbcType="VARCHAR"/>
</resultMap>
-
+
<select id="queryByUserId" parameterType="String" resultType="String">
- select sas.annt_id from sys_announcement_send sas
+ select sas.annt_id from sys_announcement_send sas
where sas.user_id = #{userId}
</select>
-
+
<select id="getMyAnnouncementSendList" parameterType="Object" resultMap="AnnouncementSendModel">
select
sas.id,
@@ -64,4 +64,4 @@
order by sas.read_flag,sa.send_time desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java
index 5437ec3..8c4a631 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java
@@ -17,14 +17,14 @@ import java.io.Serializable;
@Data
public class AnnouncementSendModel implements Serializable {
private static final long serialVersionUID = 1L;
-
+
/**id*/
@TableId(type = IdType.ASSIGN_ID)
- private java.lang.String id;
+ private java.lang.Integer id;
/**通告id*/
- private java.lang.String anntId;
+ private java.lang.Integer anntId;
/**用户id*/
- private java.lang.String userId;
+ private java.lang.Integer userId;
/**标题*/
private java.lang.String titile;
/**内容*/
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java
index 572f2d0..8146c95 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java
@@ -10,9 +10,9 @@ import org.jeecg.modules.system.entity.SysDepart;
* <p>
* 部门表 封装树结构的部门的名称的实体类
* <p>
- *
+ *
* @Author Steve
- * @Since 2019-01-22
+ * @Since 2019-01-22
*
*/
public class DepartIdModel implements Serializable {
@@ -27,32 +27,32 @@ public class DepartIdModel implements Serializable {
// 部门名称
private String title;
-
+
List<DepartIdModel> children = new ArrayList<>();
-
+
/**
* 将SysDepartTreeModel的部分数据放在该对象当中
* @param treeModel
* @return
*/
public DepartIdModel convert(SysDepartTreeModel treeModel) {
- this.key = treeModel.getId();
- this.value = treeModel.getId();
+ this.key = String.valueOf(treeModel.getId());
+ this.value = String.valueOf(treeModel.getId());
this.title = treeModel.getDepartName();
return this;
}
-
+
/**
* 该方法为用户部门的实现类所使用
* @param sysDepart
* @return
*/
public DepartIdModel convertByUserDepart(SysDepart sysDepart) {
- this.key = sysDepart.getId();
- this.value = sysDepart.getId();
+ this.key = sysDepart.getId().toString();
+ this.value = sysDepart.getId().toString();
this.title = sysDepart.getDepartName();
return this;
- }
+ }
public List<DepartIdModel> getChildren() {
return children;
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
index 86f5411..c181719 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
@@ -12,14 +12,14 @@ import java.util.Objects;
* <p>
* 部门表 存储树结构数据的实体类
* <p>
- *
+ *
* @Author Steve
- * @Since 2019-01-22
+ * @Since 2019-01-22
*/
public class SysDepartTreeModel implements Serializable{
-
+
private static final long serialVersionUID = 1L;
-
+
/** 对应SysDepart中的id字段,前端数据树中的key*/
private String key;
@@ -32,10 +32,10 @@ public class SysDepartTreeModel implements Serializable{
private boolean isLeaf;
// 以下所有字段均与SysDepart相同
-
- private String id;
- private String parentId;
+ private Integer id;
+
+ private Integer parentId;
private String departName;
@@ -46,7 +46,7 @@ public class SysDepartTreeModel implements Serializable{
private Integer departOrder;
private String description;
-
+
private String orgCategory;
private String orgType;
@@ -83,8 +83,8 @@ public class SysDepartTreeModel implements Serializable{
* @param sysDepart
*/
public SysDepartTreeModel(SysDepart sysDepart) {
- this.key = sysDepart.getId();
- this.value = sysDepart.getId();
+ this.key = sysDepart.getId().toString();
+ this.value = sysDepart.getId().toString();
this.title = sysDepart.getDepartName();
this.id = sysDepart.getId();
this.parentId = sysDepart.getParentId();
@@ -147,12 +147,12 @@ public class SysDepartTreeModel implements Serializable{
}
- public String getId() {
+ public Integer getId() {
return id;
}
public void setId(String id) {
- this.id = id;
+ this.id = Integer.valueOf(id);
}
public List<SysDepartTreeModel> getChildren() {
@@ -166,11 +166,11 @@ public class SysDepartTreeModel implements Serializable{
this.children = children;
}
- public String getParentId() {
+ public Integer getParentId() {
return parentId;
}
- public void setParentId(String parentId) {
+ public void setParentId(Integer parentId) {
this.parentId = parentId;
}
@@ -185,7 +185,7 @@ public class SysDepartTreeModel implements Serializable{
public void setDepartName(String departName) {
this.departName = departName;
}
-
+
public String getOrgCategory() {
return orgCategory;
}
@@ -367,7 +367,7 @@ public class SysDepartTreeModel implements Serializable{
Objects.equals(updateTime, model.updateTime) &&
Objects.equals(children, model.children);
}
-
+
/**
* 重写hashCode方法
*/
@@ -375,7 +375,7 @@ public class SysDepartTreeModel implements Serializable{
public int hashCode() {
return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr,
- departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address,
+ departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address,
memo, status, delFlag, qywxIdentifier, createBy, createTime, updateBy, updateTime,
children);
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDictTree.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDictTree.java
index fb7983a..5f2a921 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDictTree.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDictTree.java
@@ -28,9 +28,9 @@ public class SysDictTree implements Serializable {
private static final long serialVersionUID = 1L;
private String key;
-
+
private String title;
-
+
/**
* id
*/
@@ -42,7 +42,7 @@ public class SysDictTree implements Serializable {
* 默认为string类型
*/
private Integer type;
-
+
/**
* 字典名称
*/
@@ -82,15 +82,15 @@ public class SysDictTree implements Serializable {
* 更新时间
*/
private Date updateTime;
-
+
public SysDictTree(SysDict node) {
- this.id = node.getId();
- this.key = node.getId();
+ this.id = node.getId().toString();
+ this.key = node.getId().toString();
this.title = node.getDictName();
this.dictCode = node.getDictCode();
this.description = node.getDescription();
this.delFlag = node.getDelFlag();
this.type = node.getType();
}
-
+
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java
index 5b44d53..40ecedf 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java
@@ -51,7 +51,7 @@ public class SysPermissionTree implements Serializable {
* 跳转网页链接
*/
private String url;
-
+
/**
* 一级菜单跳转地址
*/
@@ -71,7 +71,7 @@ public class SysPermissionTree implements Serializable {
* 是否叶子节点: 1:是 0:不是
*/
private boolean isLeaf;
-
+
/**
* 是否路由菜单: 0:不是 1:是（默认值1）
*/
@@ -118,7 +118,7 @@ public class SysPermissionTree implements Serializable {
private boolean alwaysShow;
/**是否隐藏路由菜单: 0否,1是（默认值0）*/
private boolean hidden;
-
+
/**按钮权限状态(0无效1有效)*/
private java.lang.String status;
@@ -132,8 +132,8 @@ public class SysPermissionTree implements Serializable {
}
public SysPermissionTree(SysPermission permission) {
- this.key = permission.getId();
- this.id = permission.getId();
+ this.key = permission.getId().toString();
+ this.id = permission.getId().toString();
this.perms = permission.getPerms();
this.permsType = permission.getPermsType();
this.component = permission.getComponent();
@@ -145,7 +145,7 @@ public class SysPermissionTree implements Serializable {
this.isLeaf = permission.isLeaf();
this.menuType = permission.getMenuType();
this.name = permission.getName();
- this.parentId = permission.getParentId();
+ this.parentId = String.valueOf(permission.getParentId());
this.sortNo = permission.getSortNo();
this.updateBy = permission.getUpdateBy();
this.updateTime = permission.getUpdateTime();
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeModel.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeModel.java
index 417ccdd..c60c579 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeModel.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeModel.java
@@ -12,23 +12,23 @@ import org.jeecg.modules.system.entity.SysPermission;
* 树形列表用到
*/
public class TreeModel implements Serializable {
-
+
private static final long serialVersionUID = 4013193970046502756L;
private String key;
-
+
private String title;
-
+
private String slotTitle;
-
+
private boolean isLeaf;
-
+
private String icon;
-
+
private Integer ruleFlag;
-
+
private Map<String,String> scopedSlots;
-
+
public Map<String, String> getScopedSlots() {
return scopedSlots;
}
@@ -68,7 +68,7 @@ public class TreeModel implements Serializable {
public void setIcon(String icon) {
this.icon = icon;
}
-
+
private List<TreeModel> children;
public List<TreeModel> getChildren() {
@@ -80,23 +80,23 @@ public class TreeModel implements Serializable {
}
public TreeModel() {
-
+
}
-
+
public TreeModel(SysPermission permission) {
- this.key = permission.getId();
+ this.key = permission.getId().toString();
this.icon = permission.getIcon();
- this.parentId = permission.getParentId();
+ this.parentId = String.valueOf(permission.getParentId());
this.title = permission.getName();
this.slotTitle = permission.getName();
- this.value = permission.getId();
+ this.value = permission.getId().toString();
this.isLeaf = permission.isLeaf();
this.label = permission.getName();
if(!permission.isLeaf()) {
this.children = new ArrayList<TreeModel>();
}
}
-
+
public TreeModel(String key,String parentId,String slotTitle,Integer ruleFlag,boolean isLeaf) {
this.key = key;
this.parentId = parentId;
@@ -111,14 +111,14 @@ public class TreeModel implements Serializable {
this.children = new ArrayList<TreeModel>();
}
}
-
+
private String parentId;
-
+
private String label;
-
+
private String value;
-
-
+
+
public String getParentId() {
return parentId;
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
index b555251..691b805 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
@@ -32,10 +32,10 @@ public class SysAnnouncementServiceImpl extends ServiceImpl<SysAnnouncementMappe
@Resource
private SysAnnouncementMapper sysAnnouncementMapper;
-
+
@Resource
private SysAnnouncementSendMapper sysAnnouncementSendMapper;
-
+
@Transactional
@Override
public void saveAnnouncement(SysAnnouncement sysAnnouncement) {
@@ -47,19 +47,19 @@ public class SysAnnouncementServiceImpl extends ServiceImpl<SysAnnouncementMappe
// 2.插入用户通告阅读标记表记录
String userId = sysAnnouncement.getUserIds();
String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
- String anntId = sysAnnouncement.getId();
+ Integer anntId = sysAnnouncement.getId();
Date refDate = new Date();
for(int i=0;i<userIds.length;i++) {
SysAnnouncementSend announcementSend = new SysAnnouncementSend();
announcementSend.setAnntId(anntId);
- announcementSend.setUserId(userIds[i]);
+ announcementSend.setUserId(Integer.valueOf(userIds[i]));
announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
announcementSend.setReadTime(refDate);
sysAnnouncementSendMapper.insert(announcementSend);
}
}
}
-
+
/**
* @功能：编辑消息信息
*/
@@ -72,7 +72,7 @@ public class SysAnnouncementServiceImpl extends ServiceImpl<SysAnnouncementMappe
if(oConvertUtils.isNotEmpty(userId)&&sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_UESR)) {
// 2.补充新的通知用户数据
String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
- String anntId = sysAnnouncement.getId();
+ Integer anntId = sysAnnouncement.getId();
Date refDate = new Date();
for(int i=0;i<userIds.length;i++) {
LambdaQueryWrapper<SysAnnouncementSend> queryWrapper = new LambdaQueryWrapper<SysAnnouncementSend>();
@@ -82,7 +82,7 @@ public class SysAnnouncementServiceImpl extends ServiceImpl<SysAnnouncementMappe
if(announcementSends.size()<=0) {
SysAnnouncementSend announcementSend = new SysAnnouncementSend();
announcementSend.setAnntId(anntId);
- announcementSend.setUserId(userIds[i]);
+ announcementSend.setUserId(Integer.valueOf(userIds[i]));
announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
announcementSend.setReadTime(refDate);
sysAnnouncementSendMapper.insert(announcementSend);
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
index 4c30eea..228f302 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
@@ -50,7 +50,7 @@ import java.util.*;
/**
* @Description: 底层共通业务API，提供其他独立模块调用
* @Author: scott
- * @Date:2019-4-20
+ * @Date:2019-4-20
* @Version:V1.0
*/
@Slf4j
@@ -168,7 +168,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
List<SysPermissionDataRuleModel> dataRules = new ArrayList<SysPermissionDataRuleModel>();
for (SysPermission sysPermission : currentSyspermission) {
// update-begin--Author:scott Date:20191119 for：数据权限规则编码不规范，项目存在相同包名和类名 #722
- List<SysPermissionDataRule> temp = sysPermissionDataRuleService.queryPermissionDataRules(username, sysPermission.getId());
+ List<SysPermissionDataRule> temp = sysPermissionDataRuleService.queryPermissionDataRules(username, sysPermission.getId().toString());
if(temp!=null && temp.size()>0) {
//dataRules.addAll(temp);
dataRules = oConvertUtils.entityListToModelList(temp,SysPermissionDataRuleModel.class);
@@ -212,7 +212,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
return null;
}
//多部门支持in查询
- List<SysDepart> list = departMapper.queryUserDeparts(user.getId());
+ List<SysDepart> list = departMapper.queryUserDeparts(user.getId().toString());
List<String> sysMultiOrgCode = new ArrayList<String>();
if(list==null || list.size()==0) {
//当前用户无部门
@@ -253,7 +253,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
List<SysDepart> list = sysDepartService.queryDepartsByUsername(username);
List<String> result = new ArrayList<>(list.size());
for (SysDepart depart : list) {
- result.add(depart.getId());
+ result.add(depart.getId().toString());
}
return result;
}
@@ -271,7 +271,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
@Override
public DictModel getParentDepartId(String departId) {
SysDepart depart = departMapper.getParentDepartId(departId);
- DictModel model = new DictModel(depart.getId(),depart.getParentId());
+ DictModel model = new DictModel(depart.getId().toString(),depart.getParentId().toString());
return model;
}
@@ -377,7 +377,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
// 2.插入用户通告阅读标记表记录
String userId = toUser;
String[] userIds = userId.split(",");
- String anntId = announcement.getId();
+ Integer anntId = announcement.getId();
for(int i=0;i<userIds.length;i++) {
if(oConvertUtils.isNotEmpty(userIds[i])) {
SysUser sysUser = userMapper.getUserByName(userIds[i]);
@@ -394,7 +394,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId());
obj.put(WebsocketConst.MSG_ID, announcement.getId());
obj.put(WebsocketConst.MSG_TXT, announcement.getTitile());
- webSocket.sendMessage(sysUser.getId(), obj.toJSONString());
+ webSocket.sendMessage(sysUser.getId().toString(), obj.toJSONString());
}
}
try {
@@ -451,7 +451,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
// 2.插入用户通告阅读标记表记录
String userId = toUser;
String[] userIds = userId.split(",");
- String anntId = announcement.getId();
+ Integer anntId = announcement.getId();
for(int i=0;i<userIds.length;i++) {
if(oConvertUtils.isNotEmpty(userIds[i])) {
SysUser sysUser = userMapper.getUserByName(userIds[i]);
@@ -468,7 +468,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId());
obj.put(WebsocketConst.MSG_ID, announcement.getId());
obj.put(WebsocketConst.MSG_TXT, announcement.getTitile());
- webSocket.sendMessage(sysUser.getId(), obj.toJSONString());
+ webSocket.sendMessage(sysUser.getId().toString(), obj.toJSONString());
}
}
try {
@@ -506,7 +506,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
SysAnnouncement announcement = sysAnnouncementMapper.selectOne(new QueryWrapper<SysAnnouncement>().eq("bus_type",busType).eq("bus_id",busId));
if(announcement != null){
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
- String userId = sysUser.getId();
+ String userId = sysUser.getId().toString();
LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
@@ -591,7 +591,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
for(SysUser user : userList){
ComboModel model = new ComboModel();
model.setTitle(user.getRealname());
- model.setId(user.getId());
+ model.setId(user.getId().toString());
model.setUsername(user.getUsername());
list.add(model);
}
@@ -609,7 +609,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
ComboModel model = new ComboModel();
model.setUsername(user.getUsername());
model.setTitle(user.getRealname());
- model.setId(user.getId());
+ model.setId(user.getId().toString());
model.setEmail(user.getEmail());
if(oConvertUtils.isNotEmpty(userIds)){
String[] temp = userIds.split(",");
@@ -633,7 +633,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
for(SysRole role : roleList){
ComboModel model = new ComboModel();
model.setTitle(role.getRoleName());
- model.setId(role.getId());
+ model.setId(role.getId().toString());
list.add(model);
}
return list;
@@ -646,7 +646,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
for(SysRole role : roleList){
ComboModel model = new ComboModel();
model.setTitle(role.getRoleName());
- model.setId(role.getId());
+ model.setId(role.getId().toString());
model.setRoleCode(role.getRoleCode());
if(oConvertUtils.isNotEmpty(roleIds)) {
for (int i = 0; i < roleIds.length; i++) {
@@ -794,8 +794,8 @@ public class SysBaseApiImpl implements ISysBaseAPI {
List<String> listIds = departMapper.getSubDepIdsByOrgCodes(orgCodes.split(","));
List<SysUserDepart> userList = sysUserDepartService.list(new QueryWrapper<SysUserDepart>().in("dep_id",listIds));
for(SysUserDepart userDepart : userList){
- if(!userIds.contains(userDepart.getUserId())){
- userIds.add(userDepart.getUserId());
+ if(!userIds.contains(userDepart.getUserId().toString())){
+ userIds.add(userDepart.getUserId().toString());
}
}
}
@@ -954,7 +954,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
// 2.插入用户通告阅读标记表记录
String userId = toUser;
String[] userIds = userId.split(",");
- String anntId = announcement.getId();
+ Integer anntId = announcement.getId();
for(int i=0;i<userIds.length;i++) {
if(oConvertUtils.isNotEmpty(userIds[i])) {
SysUser sysUser = userMapper.getUserByName(userIds[i]);
@@ -971,7 +971,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId());
obj.put(WebsocketConst.MSG_ID, announcement.getId());
obj.put(WebsocketConst.MSG_TXT, announcement.getTitile());
- webSocket.sendMessage(sysUser.getId(), obj.toJSONString());
+ webSocket.sendMessage(sysUser.getId().toString(), obj.toJSONString());
}
}
@@ -1006,7 +1006,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
// 2.插入用户通告阅读标记表记录
String userId = toUser;
String[] userIds = userId.split(",");
- String anntId = announcement.getId();
+ Integer anntId = announcement.getId();
for(int i=0;i<userIds.length;i++) {
if(oConvertUtils.isNotEmpty(userIds[i])) {
SysUser sysUser = userMapper.getUserByName(userIds[i]);
@@ -1023,7 +1023,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId());
obj.put(WebsocketConst.MSG_ID, announcement.getId());
obj.put(WebsocketConst.MSG_TXT, announcement.getTitile());
- webSocket.sendMessage(sysUser.getId(), obj.toJSONString());
+ webSocket.sendMessage(sysUser.getId().toString(), obj.toJSONString());
}
}
}
@@ -1051,7 +1051,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
SysDepart comp=sysDepartService.queryCompByOrgCode(orgCode);
if(comp!=null){
//2.获取公司下级部门
- List<SysDepart> departs=sysDepartService.queryDeptByPid(comp.getId());
+ List<SysDepart> departs=sysDepartService.queryDeptByPid(comp.getId().toString());
//3.获取部门下的人员信息
List<Map> list=new ArrayList();
//4.处理部门和下级用户数据
@@ -1060,13 +1060,13 @@ public class SysBaseApiImpl implements ISysBaseAPI {
//部门名称
String departName = dept.getDepartName();
//根据部门编码获取下级部门id
- List<String> listIds = departMapper.getSubDepIdsByDepId(dept.getId());
+ List<String> listIds = departMapper.getSubDepIdsByDepId(dept.getId().toString());
//根据下级部门ids获取下级部门的所有用户
List<SysUserDepart> userList = sysUserDepartService.list(new QueryWrapper<SysUserDepart>().in("dep_id",listIds));
List<String> userIds = new ArrayList<>();
for(SysUserDepart userDepart : userList){
- if(!userIds.contains(userDepart.getUserId())){
- userIds.add(userDepart.getUserId());
+ if(!userIds.contains(userDepart.getUserId().toString())){
+ userIds.add(userDepart.getUserId().toString());
}
}
map.put("name",departName);
@@ -1154,4 +1154,4 @@ public class SysBaseApiImpl implements ISysBaseAPI {
return sysDictService.queryTableDictTextByKeys(table, text, code, Arrays.asList(keys.split(",")));
}
-}
\ No newline at end of file
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java
index 1c0401c..54f84ed 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java
@@ -58,7 +58,7 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
sysCategory.setPid(categoryPid);
baseMapper.insert(sysCategory);
}
-
+
@Override
public void updateSysCategory(SysCategory sysCategory) {
if(oConvertUtils.isEmpty(sysCategory.getPid())){
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java
index b9e72f1..3fa7450 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java
@@ -46,7 +46,7 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl<SysDepartPermiss
List<SysDepartPermission> list = new ArrayList<SysDepartPermission>();
for (String p : add) {
if(oConvertUtils.isNotEmpty(p)) {
- SysDepartPermission rolepms = new SysDepartPermission(departId, p);
+ SysDepartPermission rolepms = new SysDepartPermission(Integer.valueOf(departId), Integer.valueOf(p));
list.add(rolepms);
}
}
@@ -58,7 +58,7 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl<SysDepartPermiss
this.remove(new QueryWrapper<SysDepartPermission>().lambda().eq(SysDepartPermission::getDepartId, departId).eq(SysDepartPermission::getPermissionId, permissionId));
//删除部门权限时，删除部门角色中已授权的权限
List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(new LambdaQueryWrapper<SysDepartRole>().eq(SysDepartRole::getDepartId,departId));
- List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
+ List<Integer> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
if(roleIds != null && roleIds.size()>0){
departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().eq(SysDepartRolePermission::getPermissionId,permissionId));
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java
index 5ff29a7..2826986 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java
@@ -39,7 +39,7 @@ public class SysDepartRolePermissionServiceImpl extends ServiceImpl<SysDepartRol
List<SysDepartRolePermission> list = new ArrayList<SysDepartRolePermission>();
for (String p : add) {
if(oConvertUtils.isNotEmpty(p)) {
- SysDepartRolePermission rolepms = new SysDepartRolePermission(roleId, p);
+ SysDepartRolePermission rolepms = new SysDepartRolePermission(Integer.valueOf(roleId),Integer.valueOf(p));
rolepms.setOperateDate(new Date());
rolepms.setOperateIp(ip);
list.add(rolepms);
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java
index d900725..b0f7a86 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java
@@ -34,7 +34,7 @@ public class SysDepartRoleUserServiceImpl extends ServiceImpl<SysDepartRoleUserM
List<SysDepartRoleUser> list = new ArrayList<>();
for (String roleId : add) {
if(oConvertUtils.isNotEmpty(roleId)) {
- SysDepartRoleUser rolepms = new SysDepartRoleUser(userId, roleId);
+ SysDepartRoleUser rolepms = new SysDepartRoleUser(Integer.valueOf(userId), Integer.valueOf(roleId));
list.add(rolepms);
}
}
@@ -53,7 +53,7 @@ public class SysDepartRoleUserServiceImpl extends ServiceImpl<SysDepartRoleUserM
public void removeDeptRoleUser(List<String> userIds, String depId) {
for(String userId : userIds){
List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(new QueryWrapper<SysDepartRole>().eq("depart_id",depId));
- List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
+ List<Integer> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
if(roleIds != null && roleIds.size()>0){
QueryWrapper<SysDepartRoleUser> query = new QueryWrapper<>();
query.eq("user_id",userId).in("drole_id",roleIds);
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
index f1e55be..fe6126c 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
@@ -31,7 +31,7 @@ import java.util.function.Consumer;
* <p>
* 部门表 服务实现类
* <p>
- *
+ *
* @Author Steve
* @Since 2019-01-22
*/
@@ -130,13 +130,14 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
public void saveDepartData(SysDepart sysDepart, String username) {
if (sysDepart != null && username != null) {
if (sysDepart.getParentId() == null) {
- sysDepart.setParentId("");
+ sysDepart.setParentId(0);
}
- String s = UUID.randomUUID().toString().replace("-", "");
- sysDepart.setId(s);
+ //String s = UUID.randomUUID().toString().replace("-", "");
+ //sysDepart.setId(s);
+
// 先判断该对象有无父级ID,有则意味着不是最高级,否则意味着是最高级
// 获取父级ID
- String parentId = sysDepart.getParentId();
+ Integer parentId = sysDepart.getParentId();
//update-begin--Author:baihailong Date:20191209 for：部门编码规则生成器做成公用配置
JSONObject formData = new JSONObject();
formData.put("parentId",parentId);
@@ -151,14 +152,14 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
}
}
-
+
/**
* saveDepartData 的调用方法,生成部门编码和部门类型（作废逻辑）
* @deprecated
* @param parentId
* @return
*/
- private String[] generateOrgCode(String parentId) {
+ private String[] generateOrgCode(String parentId) {
//update-begin--Author:Steve Date:20190201 for：组织机构添加数据代码调整
LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
LambdaQueryWrapper<SysDepart> query1 = new LambdaQueryWrapper<SysDepart>();
@@ -216,16 +217,16 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
strArray[1] = orgType;
return strArray;
//update-end--Author:Steve Date:20190201 for：组织机构添加数据代码调整
- }
+ }
+
-
/**
* removeDepartDataById 对应 delete方法 根据ID删除相关部门数据
- *
+ *
*/
/*
* @Override
- *
+ *
* @Transactional public boolean removeDepartDataById(String id) {
* System.out.println("要删除的ID 为=============================>>>>>"+id); boolean
* flag = this.removeById(id); return flag; }
@@ -247,7 +248,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
}
}
-
+
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteBatchWithChildren(List<String> ids) {
@@ -263,7 +264,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList);
List<SysDepartRole> depRoleList = sysDepartRoleMapper.selectList(query);
for(SysDepartRole deptRole : depRoleList){
- roleIdList.add(deptRole.getId());
+ roleIdList.add(deptRole.getId().toString());
}
//根据部门id删除用户与部门关系
userDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getDepId,idList));
@@ -356,7 +357,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList);
List<SysDepartRole> depRoleList = sysDepartRoleMapper.selectList(query);
for(SysDepartRole deptRole : depRoleList){
- roleIdList.add(deptRole.getId());
+ roleIdList.add(deptRole.getId().toString());
}
//根据部门id删除用户与部门关系
userDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getDepId,idList));
@@ -372,20 +373,20 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
}
return ok;
}
-
+
/**
* delete 方法调用
* @param id
* @param idList
*/
- private void checkChildrenExists(String id, List<String> idList) {
+ private void checkChildrenExists(String id, List<String> idList) {
LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
query.eq(SysDepart::getParentId,id);
List<SysDepart> departList = this.list(query);
if(departList != null && departList.size() > 0) {
for(SysDepart depart : departList) {
- idList.add(depart.getId());
- this.checkChildrenExists(depart.getId(), idList);
+ idList.add(depart.getId().toString());
+ this.checkChildrenExists(depart.getId().toString(), idList);
}
}
}
@@ -516,7 +517,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
//TODO 异步树加载key拼接__+时间戳,以便于每次展开节点会刷新数据
//treeModel.setKey(treeModel.getKey()+"__"+System.currentTimeMillis());
treeModel.setKey(treeModel.getKey());
- Integer count=this.baseMapper.queryCountByPid(depart.getId());
+ Integer count=this.baseMapper.queryCountByPid(depart.getId().toString());
if(count>0){
treeModel.setIsLeaf(false);
}else{
@@ -572,9 +573,9 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
SysDepart depart = super.getOne(queryWrapper);
if (depart != null) {
data.getJSONArray("parentIds").add(0, depart.getId());
- data.getJSONObject("parentMap").put(depart.getId(), depart);
+ data.getJSONObject("parentMap").put(depart.getId().toString(), depart);
if (oConvertUtils.isNotEmpty(depart.getParentId())) {
- this.queryAllParentIdRecursion("id", depart.getParentId(), data);
+ this.queryAllParentIdRecursion("id", depart.getParentId().toString(), data);
}
}
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
index 3382fb9..af83fa2 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
@@ -144,7 +144,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
log.debug("无缓存dictTableList的时候调用这里！");
return sysDictMapper.queryTableDictItemsByCodeAndFilter(table,text,code,filterSql);
}
-
+
/**
* 通过查询指定table的 text code 获取字典值text
* dictTableCache采用redis缓存有效期10分钟
@@ -258,7 +258,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
public List<DictModel> queryAllUserBackDictModel() {
return baseMapper.queryAllUserBackDictModel();
}
-
+
@Override
public List<DictModel> queryTableDictItems(String table, String text, String code, String keyword) {
return baseMapper.queryTableDictItems(table, text, code, "%"+keyword+"%");
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
index 06d2b61..3a06920 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
@@ -42,7 +42,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
@Resource
private SysPermissionMapper sysPermissionMapper;
-
+
@Resource
private ISysPermissionDataRuleService permissionDataRuleService;
@@ -71,7 +71,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
if(sysPermission==null) {
throw new JeecgBootException("未找到菜单信息");
}
- String pid = sysPermission.getParentId();
+ String pid = String.valueOf(sysPermission.getParentId());
if(oConvertUtils.isNotEmpty(pid)) {
int count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, pid));
if(count==1) {
@@ -81,7 +81,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
}
sysPermissionMapper.deleteById(id);
// 该节点可能是子节点但也可能是其它节点的父节点,所以需要级联删除
- this.removeChildrenBy(sysPermission.getId());
+ this.removeChildrenBy(sysPermission.getId().toString());
//关联删除
Map map = new HashMap<>();
map.put("permission_id",id);
@@ -94,10 +94,10 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
//删除部门角色授权
sysDepartRolePermissionMapper.deleteByMap(map);
}
-
+
/**
* 根据父id删除其关联的子节点数据
- *
+ *
* @return
*/
public void removeChildrenBy(String parentId) {
@@ -113,7 +113,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
this.remove(query);
// 再遍历刚才查出的集合, 根据每个对象,查找其是否仍有子级
for (int i = 0, len = permissionList.size(); i < len; i++) {
- id = permissionList.get(i).getId();
+ id = permissionList.get(i).getId().toString();
Map map = new HashMap<>();
map.put("permission_id",id);
//删除数据规则
@@ -132,7 +132,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
}
}
}
-
+
/**
* 逻辑删除
*/
@@ -144,7 +144,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
if(sysPermission==null) {
throw new JeecgBootException("未找到菜单信息");
}
- String pid = sysPermission.getParentId();
+ String pid = String.valueOf(sysPermission.getParentId());
int count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, pid));
if(count==1) {
//若父节点无其他子节点，则该父节点是叶子节点
@@ -163,7 +163,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
sysPermission.setParentId(null);
}
//----------------------------------------------------------------------
- String pid = sysPermission.getParentId();
+ String pid = String.valueOf(sysPermission.getParentId());
if(oConvertUtils.isNotEmpty(pid)) {
//设置父节点不为叶子节点
this.sysPermissionMapper.setMenuLeaf(pid, 0);
@@ -186,7 +186,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
//----------------------------------------------------------------------
//Step1.判断是否是一级菜单，是的话清空父菜单ID
if(CommonConstant.MENU_TYPE_0.equals(sysPermission.getMenuType())) {
- sysPermission.setParentId("");
+ sysPermission.setParentId(0);
}
//Step2.判断菜单下级是否有菜单，无则设置为叶子节点
int count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, sysPermission.getId()));
@@ -195,9 +195,9 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
}
//----------------------------------------------------------------------
this.updateById(sysPermission);
-
+
//如果当前菜单的父菜单变了，则需要修改新父菜单和老父菜单的，叶子节点状态
- String pid = sysPermission.getParentId();
+ String pid = String.valueOf(sysPermission.getParentId());
if((oConvertUtils.isNotEmpty(pid) && !pid.equals(p.getParentId())) || oConvertUtils.isEmpty(pid)&&oConvertUtils.isNotEmpty(p.getParentId())) {
//a.设置新的父菜单不为叶子节点
this.sysPermissionMapper.setMenuLeaf(pid, 0);
@@ -205,13 +205,13 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
int cc = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, p.getParentId()));
if(cc==0) {
if(oConvertUtils.isNotEmpty(p.getParentId())) {
- this.sysPermissionMapper.setMenuLeaf(p.getParentId(), 1);
+ this.sysPermissionMapper.setMenuLeaf(p.getParentId().toString(), 1);
}
}
-
+
}
}
-
+
}
@Override
@@ -228,7 +228,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
query.eq(SysPermissionDataRule::getPermissionId, id);
int countValue = this.permissionDataRuleService.count(query);
if(countValue > 0) {
- this.permissionDataRuleService.remove(query);
+ this.permissionDataRuleService.remove(query);
}
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java
index 79ff4ae..8864fed 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java
@@ -47,7 +47,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
String[] arr = permissionIds.split(",");
for (String p : arr) {
if(oConvertUtils.isNotEmpty(p)) {
- SysRolePermission rolepms = new SysRolePermission(roleId, p);
+ SysRolePermission rolepms = new SysRolePermission(Integer.valueOf(roleId), Integer.valueOf(p));
rolepms.setOperateDate(new Date());
rolepms.setOperateIp(ip);
list.add(rolepms);
@@ -72,7 +72,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
List<SysRolePermission> list = new ArrayList<SysRolePermission>();
for (String p : add) {
if(oConvertUtils.isNotEmpty(p)) {
- SysRolePermission rolepms = new SysRolePermission(roleId, p);
+ SysRolePermission rolepms = new SysRolePermission(Integer.valueOf(roleId), Integer.valueOf(p));
rolepms.setOperateDate(new Date());
rolepms.setOperateIp(ip);
list.add(rolepms);
@@ -80,7 +80,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
}
this.saveBatch(list);
}
-
+
List<String> delete = getDiff(permissionIds,lastPermissionIds);
if(delete!=null && delete.size()>0) {
for (String permissionId : delete) {
@@ -88,7 +88,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
}
}
}
-
+
/**
* 从diff中找出main中没有的元素
* @param main
@@ -102,7 +102,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
if(oConvertUtils.isEmpty(main)) {
return Arrays.asList(diff.split(","));
}
-
+
String[] mainArr = main.split(",");
String[] diffArr = diff.split(",");
Map<String, Integer> map = new HashMap<>();
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java
index 8d2345c..ec3f5bc 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java
@@ -33,17 +33,16 @@ import java.util.List;
@Service
@Slf4j
public class SysThirdAccountServiceImpl extends ServiceImpl<SysThirdAccountMapper, SysThirdAccount> implements ISysThirdAccountService {
-
+
@Autowired
private SysThirdAccountMapper sysThirdAccountMapper;
-
@Autowired
private SysUserMapper sysUserMapper;
@Autowired
private SysRoleMapper sysRoleMapper;
@Autowired
private SysUserRoleMapper sysUserRoleMapper;
-
+
@Override
public void updateThirdUserId(SysUser sysUser,String thirdUserUuid) {
//修改第三方登录账户表使其进行添加用户id
@@ -51,7 +50,7 @@ public class SysThirdAccountServiceImpl extends ServiceImpl<SysThirdAccountMappe
query.eq(SysThirdAccount::getThirdUserUuid,thirdUserUuid);
SysThirdAccount account = sysThirdAccountMapper.selectOne(query);
SysThirdAccount sysThirdAccount = new SysThirdAccount();
- sysThirdAccount.setSysUserId(sysUser.getId());
+ sysThirdAccount.setSysUserId(sysUser.getId().toString());
//根据当前用户id和登录方式查询第三方登录表
LambdaQueryWrapper<SysThirdAccount> thirdQuery = new LambdaQueryWrapper<>();
thirdQuery.eq(SysThirdAccount::getSysUserId,sysUser.getId());
@@ -64,7 +63,7 @@ public class SysThirdAccountServiceImpl extends ServiceImpl<SysThirdAccountMappe
//更新用户账户表sys_user_id
sysThirdAccountMapper.update(sysThirdAccount,query);
}
-
+
@Override
public SysUser createUser(String phone, String thirdUserUuid) {
//先查询第三方，获取登录方式
@@ -99,20 +98,20 @@ public class SysThirdAccountServiceImpl extends ServiceImpl<SysThirdAccountMappe
sysThirdAccountMapper.update(sysThirdAccount,query);
return user;
}
-
+
public String saveThirdUser(SysUser sysUser) {
//保存用户
- String userid = UUIDGenerator.generate();
- sysUser.setId(userid);
+ //String userid = UUIDGenerator.generate();
+ //sysUser.setId(userid);
sysUserMapper.insert(sysUser);
//获取第三方角色
SysRole sysRole = sysRoleMapper.selectOne(new LambdaQueryWrapper<SysRole>().eq(SysRole::getRoleCode, "third_role"));
//保存用户角色
SysUserRole userRole = new SysUserRole();
userRole.setRoleId(sysRole.getId());
- userRole.setUserId(userid);
+ userRole.setUserId(sysUser.getId());
sysUserRoleMapper.insert(userRole);
- return userid;
+ return sysUser.getId().toString();
}
@Override
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
index 143df8f..7bfae46 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
@@ -36,7 +36,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
private ISysDepartService sysDepartService;
@Autowired
private ISysUserService sysUserService;
-
+
/**
* 根据用户id查询部门信息
@@ -52,7 +52,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
List<SysUserDepart> userDepList = this.list(queryUDep);
if(userDepList != null && userDepList.size() > 0) {
for(SysUserDepart userDepart : userDepList) {
- depIdList.add(userDepart.getDepId());
+ depIdList.add(userDepart.getDepId().toString());
}
queryDep.in(SysDepart::getId, depIdList);
List<SysDepart> depList = sysDepartService.list(queryDep);
@@ -67,8 +67,8 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
e.fillInStackTrace();
}
return null;
-
-
+
+
}
@@ -83,7 +83,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
List<SysUserDepart> uDepList = this.list(queryUDep);
if(uDepList != null && uDepList.size() > 0) {
for(SysUserDepart uDep : uDepList) {
- userIdList.add(uDep.getUserId());
+ userIdList.add(uDep.getUserId().toString());
}
List<SysUser> userList = (List<SysUser>) sysUserService.listByIds(userIdList);
//update-begin-author:taoyan date:201905047 for:接口调用查询返回结果不能返回密码相关信息
@@ -112,7 +112,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
// 返回的用户数据去掉密码信息
sysUser.setSalt("");
sysUser.setPassword("");
- map.put(sysUser.getId(), sysUser);
+ map.put(sysUser.getId().toString(), sysUser);
}
return new ArrayList<SysUser>(map.values());
//update-end-author:taoyan date:20210422 for: 根据部门选择用户接口代码优化
@@ -140,7 +140,13 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
}
List<SysUser> userList = pageList.getRecords();
if(userList!=null && userList.size()>0){
- List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
+ List<String> userIds =new ArrayList<>();
+
+ //List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
+ for (SysUser user : userList) {
+ userIds.add(user.getId().toString());
+ }
+
Map<String, SysUser> map = new HashMap<String, SysUser>();
if(userIds!=null && userIds.size()>0){
// 查部门名称
@@ -151,7 +157,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
item.setSalt("");
item.setPassword("");
// 去重
- map.put(item.getId(), item);
+ map.put(item.getId().toString(), item);
});
}
pageList.setRecords(new ArrayList<SysUser>(map.values()));
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index 274c642..259d39e 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -131,7 +131,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
if(oConvertUtils.isNotEmpty(roles)) {
String[] arr = roles.split(",");
for (String roleId : arr) {
- SysUserRole userRole = new SysUserRole(user.getId(), roleId);
+ SysUserRole userRole = new SysUserRole(user.getId(), Integer.valueOf(roleId));
sysUserRoleMapper.insert(userRole);
}
}
@@ -147,7 +147,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
if(oConvertUtils.isNotEmpty(roles)) {
String[] arr = roles.split(",");
for (String roleId : arr) {
- SysUserRole userRole = new SysUserRole(user.getId(), roleId);
+ SysUserRole userRole = new SysUserRole(user.getId(), Integer.valueOf(roleId));
sysUserRoleMapper.insert(userRole);
}
}
@@ -212,7 +212,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
//多部门支持in查询
- List<SysDepart> list = sysDepartMapper.queryUserDeparts(user.getId());
+ List<SysDepart> list = sysDepartMapper.queryUserDeparts(user.getId().toString());
List<String> sysMultiOrgCode = new ArrayList<String>();
if(list==null || list.size()==0) {
//当前用户无部门
@@ -310,7 +310,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
if(oConvertUtils.isNotEmpty(selectedParts)) {
String[] arr = selectedParts.split(",");
for (String deaprtId : arr) {
- SysUserDepart userDeaprt = new SysUserDepart(user.getId(), deaprtId);
+ SysUserDepart userDeaprt = new SysUserDepart(user.getId(),Integer.valueOf(deaprtId));
sysUserDepartMapper.insert(userDeaprt);
}
}
@@ -334,7 +334,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
if(!Arrays.asList(arr).contains(depart.getDepId())){
List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(
new QueryWrapper<SysDepartRole>().lambda().eq(SysDepartRole::getDepartId,depart.getDepId()));
- List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
+
+ List<String> roleIds=new ArrayList<>();
+ for (SysDepartRole role : sysDepartRoleList) {
+ roleIds.add(role.getId().toString());
+ }
+ //List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
if(roleIds != null && roleIds.size()>0){
departRoleUserMapper.delete(new QueryWrapper<SysDepartRoleUser>().lambda().eq(SysDepartRoleUser::getUserId, user.getId())
.in(SysDepartRoleUser::getDroleId,roleIds));
@@ -346,7 +351,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId()));
if(oConvertUtils.isNotEmpty(departs)) {
for (String departId : arr) {
- SysUserDepart userDepart = new SysUserDepart(user.getId(), departId);
+ SysUserDepart userDepart = new SysUserDepart(user.getId(), Integer.valueOf(departId));
sysUserDepartMapper.insert(userDepart);
}
}
@@ -439,15 +444,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public void saveThirdUser(SysUser sysUser) {
//保存用户
- String userid = UUIDGenerator.generate();
- sysUser.setId(userid);
+ //String userid = UUIDGenerator.generate();
+ //sysUser.setId(userid);
baseMapper.insert(sysUser);
//获取第三方角色
SysRole sysRole = sysRoleMapper.selectOne(new LambdaQueryWrapper<SysRole>().eq(SysRole::getRoleCode, "third_role"));
//保存用户角色
SysUserRole userRole = new SysUserRole();
userRole.setRoleId(sysRole.getId());
- userRole.setUserId(userid);
+ userRole.setUserId(sysUser.getId());
sysUserRoleMapper.insert(userRole);
}
@@ -465,7 +470,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
if(oConvertUtils.isNotEmpty(selectedRoles)) {
String[] arr = selectedRoles.split(",");
for (String roleId : arr) {
- SysUserRole userRole = new SysUserRole(user.getId(), roleId);
+ SysUserRole userRole = new SysUserRole(user.getId(), Integer.valueOf(roleId));
sysUserRoleMapper.insert(userRole);
}
}
@@ -473,7 +478,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
if(oConvertUtils.isNotEmpty(selectedDeparts)) {
String[] arr = selectedDeparts.split(",");
for (String deaprtId : arr) {
- SysUserDepart userDeaprt = new SysUserDepart(user.getId(), deaprtId);
+ SysUserDepart userDeaprt = new SysUserDepart(user.getId(), Integer.valueOf(deaprtId));
sysUserDepartMapper.insert(userDeaprt);
}
}
@@ -491,7 +496,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
if(oConvertUtils.isNotEmpty(roles)) {
String[] arr = roles.split(",");
for (String roleId : arr) {
- SysUserRole userRole = new SysUserRole(user.getId(), roleId);
+ SysUserRole userRole = new SysUserRole(user.getId(), Integer.valueOf(roleId));
sysUserRoleMapper.insert(userRole);
}
}
@@ -509,7 +514,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
if(!Arrays.asList(arr).contains(depart.getDepId())){
List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(
new QueryWrapper<SysDepartRole>().lambda().eq(SysDepartRole::getDepartId,depart.getDepId()));
- List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
+ List<String> roleIds=new ArrayList<>();
+ for (SysDepartRole role : sysDepartRoleList) {
+ roleIds.add(role.getId().toString());
+ }
+ //List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
if(roleIds != null && roleIds.size()>0){
departRoleUserMapper.delete(new QueryWrapper<SysDepartRoleUser>().lambda().eq(SysDepartRoleUser::getUserId, user.getId())
.in(SysDepartRoleUser::getDroleId,roleIds));
@@ -521,7 +530,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId()));
if(oConvertUtils.isNotEmpty(departs)) {
for (String departId : arr) {
- SysUserDepart userDepart = new SysUserDepart(user.getId(), departId);
+ SysUserDepart userDepart = new SysUserDepart(user.getId(), Integer.valueOf(departId));
sysUserDepartMapper.insert(userDepart);
}
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java
index e596e14..49d083c 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java
@@ -214,7 +214,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
// 执行更新操作
SysDepart updateSysDepart = this.dtDepartmentToSysDepart(departmentTree, sysDepart);
if (sysParentId != null) {
- updateSysDepart.setParentId(sysParentId);
+ updateSysDepart.setParentId(Integer.valueOf(sysParentId));
}
try {
sysDepartService.updateDepartDataById(updateSysDepart, username);
@@ -225,13 +225,13 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
}
if (departmentTree.hasChildren()) {
// 紧接着同步子级
- this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), updateSysDepart.getId(), username, syncInfo, accessToken);
+ this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), updateSysDepart.getId().toString(), username, syncInfo, accessToken);
}
} else {
// 执行新增操作
SysDepart newSysDepart = this.dtDepartmentToSysDepart(departmentTree, null);
if (sysParentId != null) {
- newSysDepart.setParentId(sysParentId);
+ newSysDepart.setParentId(Integer.valueOf(sysParentId));
// 2 = 组织机构
newSysDepart.setOrgCategory("2");
} else {
@@ -243,7 +243,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
// 更新钉钉 source_identifier
Department updateDtDepart = new Department();
updateDtDepart.setDept_id(departmentTree.getDept_id());
- updateDtDepart.setSource_identifier(newSysDepart.getId());
+ updateDtDepart.setSource_identifier(newSysDepart.getId().toString());
Response response = JdtDepartmentAPI.update(updateDtDepart, accessToken);
if (!response.isSuccess()) {
throw new RuntimeException(response.getErrmsg());
@@ -255,7 +255,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
}
// 紧接着同步子级
if (departmentTree.hasChildren()) {
- this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), newSysDepart.getId(), username, syncInfo, accessToken);
+ this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), newSysDepart.getId().toString(), username, syncInfo, accessToken);
}
}
}
@@ -323,7 +323,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
* 1. 查询 sys_third_account（第三方账号表）是否有数据，如果有代表已同步
* 2. 本地表里没有，就先用手机号判断，不通过再用username(用户账号)判断。
*/
- SysThirdAccount sysThirdAccount = sysThirdAccountService.getOneBySysUserId(sysUser.getId(), THIRD_TYPE);
+ SysThirdAccount sysThirdAccount = sysThirdAccountService.getOneBySysUserId(sysUser.getId().toString(), THIRD_TYPE);
if (sysThirdAccount != null && oConvertUtils.isNotEmpty(sysThirdAccount.getThirdUserId())) {
// sys_third_account 表匹配成功，通过第三方userId查询出第三方userInfo
dtUserInfo = JdtUserAPI.getUserById(sysThirdAccount.getThirdUserId(), accessToken);
@@ -362,7 +362,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
if (apiSuccess && (sysThirdAccount == null || oConvertUtils.isEmpty(sysThirdAccount.getThirdUserId()))) {
if (sysThirdAccount == null) {
sysThirdAccount = new SysThirdAccount();
- sysThirdAccount.setSysUserId(sysUser.getId());
+ sysThirdAccount.setSysUserId(sysUser.getId().toString());
sysThirdAccount.setStatus(1);
sysThirdAccount.setDelFlag(0);
sysThirdAccount.setThirdType(THIRD_TYPE);
@@ -408,7 +408,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
this.syncUserCollectErrInfo(e, dtUserInfo, syncInfo);
}
//第三方账号关系表
- this.thirdAccountSaveOrUpdate(sysThirdAccount, updateSysUser.getId(), dtUserInfo.getUserid());
+ this.thirdAccountSaveOrUpdate(sysThirdAccount, updateSysUser.getId().toString(), dtUserInfo.getUserid());
}else{
// 如果没有匹配到用户，则走创建逻辑
SysUser newSysUser = this.dtUserToSysUser(dtUserInfo);
@@ -420,7 +420,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
this.syncUserCollectErrInfo(e, dtUserInfo, syncInfo);
}
//第三方账号关系表
- this.thirdAccountSaveOrUpdate(null, newSysUser.getId(), dtUserInfo.getUserid());
+ this.thirdAccountSaveOrUpdate(null, newSysUser.getId().toString(), dtUserInfo.getUserid());
}
}
return syncInfo;
@@ -533,7 +533,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
List<Integer> departmentIdList = new ArrayList<>();
for (SysDepart sysDepart : departList) {
// 企业微信的部门id
- Department department = this.getDepartmentByDepartId(sysDepart.getId(), allDepartment);
+ Department department = this.getDepartmentByDepartId(sysDepart.getId().toString(), allDepartment);
if (department != null) {
departmentIdList.add(department.getDept_id());
}
@@ -622,7 +622,11 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
}
// 根据用户部门
LambdaQueryWrapper<SysDepart> departQueryWrapper = new LambdaQueryWrapper<>();
- List<String> departIdList = sysUserDepartList.stream().map(SysUserDepart::getDepId).collect(Collectors.toList());
+ List<String> departIdList=new ArrayList<>();
+ for (SysUserDepart s : sysUserDepartList) {
+ departIdList.add(s.getId().toString());
+ }
+ //List<String> departIdList = sysUserDepartList.stream().map(SysUserDepart::getDepId).collect(Collectors.toList());
departQueryWrapper.in(SysDepart::getId, departIdList);
List<SysDepart> departList = sysDepartService.list(departQueryWrapper);
return departList.size() == 0 ? null : departList;
@@ -646,7 +650,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
*/
private Department sysDepartToDtDepartment(SysDepartTreeModel departTree, Integer parentId) {
Department department = new Department();
- department.setSource_identifier(departTree.getId());
+ department.setSource_identifier(departTree.getId().toString());
return this.sysDepartToDtDepartment(departTree, department, parentId);
}
@@ -809,7 +813,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
LambdaQueryWrapper<SysAnnouncementSend> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysAnnouncementSend::getAnntId, announcement.getId());
SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendMapper.selectOne(queryWrapper);
- userIds = new String[] {sysAnnouncementSend.getUserId()};
+ userIds = new String[] {sysAnnouncementSend.getUserId().toString()};
}
if(userIds!=null){
@@ -900,7 +904,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
thirdAccount.setRealname(appUser.getName());
thirdAccount.setThirdUserId(appUser.getUserid());
thirdAccount.setThirdUserUuid(appUser.getUserid());
- thirdAccount.setSysUserId(sysUser.getId());
+ thirdAccount.setSysUserId(sysUser.getId().toString());
sysThirdAccountService.updateById(thirdAccount);
return sysUser;
} else {
@@ -911,4 +915,4 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
}
}
-}
\ No newline at end of file
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java
index c6f1b96..6a5c597 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java
@@ -235,7 +235,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
// 执行更新操作
SysDepart updateSysDepart = this.qwDepartmentToSysDepart(departmentTree, sysDepart);
if (sysParentId != null) {
- updateSysDepart.setParentId(sysParentId);
+ updateSysDepart.setParentId(Integer.valueOf(sysParentId));
}
try {
sysDepartService.updateDepartDataById(updateSysDepart, username);
@@ -246,13 +246,13 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
}
if (departmentTree.hasChildren()) {
// 紧接着同步子级
- this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), updateSysDepart.getId(), username, syncInfo);
+ this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), updateSysDepart.getId().toString(), username, syncInfo);
}
} else {
// 执行新增操作
SysDepart newSysDepart = this.qwDepartmentToSysDepart(departmentTree, null);
if (sysParentId != null) {
- newSysDepart.setParentId(sysParentId);
+ newSysDepart.setParentId(Integer.valueOf(sysParentId));
// 2 = 组织机构
newSysDepart.setOrgCategory("2");
} else {
@@ -268,7 +268,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
}
// 紧接着同步子级
if (departmentTree.hasChildren()) {
- this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), newSysDepart.getId(), username, syncInfo);
+ this.syncDepartmentToLocalRecursion(departmentTree.getChildren(), newSysDepart.getId().toString(), username, syncInfo);
}
}
}
@@ -314,7 +314,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
* 2. 本地表里没有，就先用手机号判断，不通过再用username判断。
*/
User qwUser;
- SysThirdAccount sysThirdAccount = sysThirdAccountService.getOneBySysUserId(sysUser.getId(), THIRD_TYPE);
+ SysThirdAccount sysThirdAccount = sysThirdAccountService.getOneBySysUserId(sysUser.getId().toString(), THIRD_TYPE);
for (User qwUserTemp : qwUsers) {
if (sysThirdAccount == null || oConvertUtils.isEmpty(sysThirdAccount.getThirdUserId()) || !sysThirdAccount.getThirdUserId().equals(qwUserTemp.getUserid())) {
// sys_third_account 表匹配失败，尝试用手机号匹配
@@ -333,7 +333,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
int errCode = JwUserAPI.updateUser(qwUser, accessToken);
// 收集错误信息
this.syncUserCollectErrInfo(errCode, sysUser, syncInfo);
- this.thirdAccountSaveOrUpdate(sysThirdAccount, sysUser.getId(), qwUser.getUserid());
+ this.thirdAccountSaveOrUpdate(sysThirdAccount, sysUser.getId().toString(), qwUser.getUserid());
// 更新完成，直接跳到下一次外部循环继续
continue for1;
}
@@ -343,7 +343,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
// 收集错误信息
boolean apiSuccess = this.syncUserCollectErrInfo(errCode, sysUser, syncInfo);
if (apiSuccess) {
- this.thirdAccountSaveOrUpdate(sysThirdAccount, sysUser.getId(), qwUser.getUserid());
+ this.thirdAccountSaveOrUpdate(sysThirdAccount, sysUser.getId().toString(), qwUser.getUserid());
}
}
return syncInfo;
@@ -388,7 +388,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
this.syncUserCollectErrInfo(e, qwUser, syncInfo);
}
- this.thirdAccountSaveOrUpdate(sysThirdAccount, updateSysUser.getId(), qwUser.getUserid());
+ this.thirdAccountSaveOrUpdate(sysThirdAccount, updateSysUser.getId().toString(), qwUser.getUserid());
// 更新完成，直接跳到下一次外部循环继续
}else{
// 没匹配到用户则走新增逻辑
@@ -400,7 +400,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
} catch (Exception e) {
this.syncUserCollectErrInfo(e, qwUser, syncInfo);
}
- this.thirdAccountSaveOrUpdate(sysThirdAccount, newSysUser.getId(), qwUser.getUserid());
+ this.thirdAccountSaveOrUpdate(sysThirdAccount, newSysUser.getId().toString(), qwUser.getUserid());
}
}
return syncInfo;
@@ -581,7 +581,11 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
}
// 根据用户部门
LambdaQueryWrapper<SysDepart> departQueryWrapper = new LambdaQueryWrapper<>();
- List<String> departIdList = sysUserDepartList.stream().map(SysUserDepart::getDepId).collect(Collectors.toList());
+ List<String> departIdList=new ArrayList<>();
+ for (SysUserDepart s : sysUserDepartList) {
+ departIdList.add(s.getId().toString());
+ }
+ //List<String> departIdList = sysUserDepartList.stream().map(SysUserDepart::getDepId).collect(Collectors.toList());
departQueryWrapper.in(SysDepart::getId, departIdList);
List<SysDepart> departList = sysDepartService.list(departQueryWrapper);
return departList.size() == 0 ? null : departList;
@@ -777,7 +781,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
LambdaQueryWrapper<SysAnnouncementSend> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysAnnouncementSend::getAnntId, announcement.getId());
SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendMapper.selectOne(queryWrapper);
- userIds = new String[] {sysAnnouncementSend.getUserId()};
+ userIds = new String[] {String.valueOf(sysAnnouncementSend.getUserId())};
}
List<String> usernameList = sysUserService.userIdToUsername(Arrays.asList(userIds));
usernameString = String.join(",", usernameList);
@@ -876,7 +880,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
thirdAccount.setRealname(appUser.getName());
thirdAccount.setThirdUserId(appUser.getUserid());
thirdAccount.setThirdUserUuid(appUser.getUserid());
- thirdAccount.setSysUserId(sysUser.getId());
+ thirdAccount.setSysUserId(sysUser.getId().toString());
sysThirdAccountService.updateById(thirdAccount);
return sysUser;
} else {