From 767825c89d220941f730c61065285518408ca965 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 06 十二月 2023 14:20:07 +0800
Subject: [PATCH] 漏洞修复
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 125 +++++-----
consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java | 215 +++----------------
consum-base/src/main/java/com/consum/base/pojo/FinSysTenantUserSearchParam.java | 118 ----------
consum-base/src/main/java/com/consum/base/pojo/request/FinSysTenantUserParam.java | 89 ++++++++
consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser.java | 73 ++----
5 files changed, 214 insertions(+), 406 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index 868cd29..8c26bf4 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -18,7 +18,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -34,6 +33,7 @@
import com.consum.base.pojo.FinSysTenantUserSearchParam;
import com.consum.base.pojo.FinSysTenantUserUpdParam;
import com.consum.base.pojo.ImportUserParam;
+import com.consum.base.pojo.request.FinSysTenantUserParam;
import com.consum.base.pojo.response.DepartmentVO;
import com.consum.base.pojo.response.FinSysTenantUserVO;
import com.consum.base.pojo.response.FinSysTenantVO;
@@ -205,43 +205,45 @@
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
public ResponseValue add() {
- FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
- FinSysTenantUser formInventoryParam = new FinSysTenantUser();
- CommonUtil.copyProperties(user, formInventoryParam);
- user = formInventoryParam;
- if (user == null) {
+ FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+ FinSysTenantUser tenantUser = new FinSysTenantUser();
+ CommonUtil.copyProperties(user, tenantUser);
+
+ if (tenantUser == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
// 鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
- if (finSysTenantUserService.getByUserCode(user.getUserCode()) != null
- && finSysTenantUserService.getByUserCode(user.getUserCode()) > 0) {
+ if (finSysTenantUserService.getByUserCode(tenantUser.getUserCode()) != null
+ && finSysTenantUserService.getByUserCode(tenantUser.getUserCode()) > 0) {
return ResponseValue.error("鍛樺伐缂栧彿閲嶅");
}
- if (user.getTenantId() == null || "".equals(user.getTenantId()) || new Integer(user.getTenantId()) == 0) {
+
+ if (StringUtils.isEmpty(tenantUser.getTenantId()) || "0".equals(tenantUser.getTenantId())) {
return ResponseValue.error("娣诲姞鏃惰閫夋嫨鍖哄幙");
}
- if (user.getTenantCode() == null || "".equals(user.getTenantCode()) || new Integer(user.getTenantCode()) == 0) {
+
+ if (StringUtils.isEmpty(tenantUser.getTenantCode()) || "0".equals(tenantUser.getTenantCode())) {
return ResponseValue.error("娣诲姞鏃惰閫夋嫨鍖哄幙");
}
// 鎻掑叆绯荤粺鐢ㄦ埛
- user.setId(NumberGenerator.getLongSequenceNumber());
- user.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- user.setCreateBy(this.getCurrentUser().getUser_name());
- user.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- user.setUpdateBy(this.getCurrentUser().getUser_name());
+ tenantUser.setId(NumberGenerator.getLongSequenceNumber());
+ tenantUser.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+ tenantUser.setCreateBy(this.getCurrentUser().getUser_name());
+ tenantUser.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+ tenantUser.setUpdateBy(this.getCurrentUser().getUser_name());
// user.setStatus(1);// 0绂佺敤 1鍚敤
- user.setIsDelete(0);
- user.setSysUserId(NumberGenerator.getLongSequenceNumber());
+ tenantUser.setIsDelete(0);
+ tenantUser.setSysUserId(NumberGenerator.getLongSequenceNumber());
// 鍔犲瘑鎵嬫満鍙�
String key = PlatformRSAUtils.AES_KEY;
String encPhone = "";
- if (user.getUserPhone() != null) {
- encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
+ if (tenantUser.getUserPhone() != null) {
+ encPhone = AESUtils.encryptStrAES(tenantUser.getUserPhone(), key);
}
- user.setUserPhone(encPhone);
+ tenantUser.setUserPhone(encPhone);
// 鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
- user.setSysDeptId(3L); // 瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
- this.finSysTenantUserService.insert(user);
+ tenantUser.setSysDeptId(3L); // 瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
+ this.finSysTenantUserService.insert(tenantUser);
// 鎻掑叆骞冲彴鐢ㄦ埛
S_user_core userCore = new S_user_core();
userCore.setId(user.getSysUserId());
@@ -484,22 +486,21 @@
@PostMapping("/update")
@Transactional(rollbackFor = Exception.class)
public ResponseValue update() {
- FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
- FinSysTenantUser formInventoryParam = new FinSysTenantUser();
- CommonUtil.copyProperties(user, formInventoryParam);
- user = formInventoryParam;
+ FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+ FinSysTenantUser tenantUser = new FinSysTenantUser();
+ CommonUtil.copyProperties(user, tenantUser);
- if (user == null) {
+ if (tenantUser == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
String key = PlatformRSAUtils.AES_KEY;
String encPhone = "";
- if (user.getUserPhone() != null) {
- encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
+ if (tenantUser.getUserPhone() != null) {
+ encPhone = AESUtils.encryptStrAES(tenantUser.getUserPhone(), key);
}
- user.setUserPhone(encPhone);
+ tenantUser.setUserPhone(encPhone);
// 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER
- finSysTenantUserService.update(user);
+ finSysTenantUserService.update(tenantUser);
// 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
S_user_core userCore = new S_user_core();
userCore.setId(user.getSysUserId());
@@ -543,15 +544,14 @@
@PostMapping("/updateStatus")
@Transactional(rollbackFor = Exception.class)
public ResponseValue updateStatus() {
- FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
- FinSysTenantUser formInventoryParam = new FinSysTenantUser();
- CommonUtil.copyProperties(user, formInventoryParam);
- user = formInventoryParam;
- if (user == null) {
+ FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+ FinSysTenantUser tenantUser = new FinSysTenantUser();
+ CommonUtil.copyProperties(user, tenantUser);
+ if (tenantUser == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
// 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER 搴旇鏄煡璇� 鐒跺悗鍙敼鐘舵��
- List<FinSysTenantUser> select = finSysTenantUserService.select(new FinSysTenantUser(user.getId()));
+ List<FinSysTenantUser> select = finSysTenantUserService.select(new FinSysTenantUser(tenantUser.getId()));
if (select == null || select.size() == 0) {
return ResponseValue.error("鐢ㄦ埛涓嶅瓨鍦�");
}
@@ -580,15 +580,20 @@
* @Date 2023/7/17 14:36
*/
@PostMapping("/defaultPassword")
- public ResponseValue defaultPassword(@RequestBody FinSysTenantUser finSysTenantUser) {
- if (finSysTenantUser == null) {
+ public ResponseValue defaultPassword() {
+ FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+ FinSysTenantUserParam tenantUser = new FinSysTenantUserParam();
+ CommonUtil.copyProperties(user, tenantUser);
+ user = tenantUser;
+
+ if (Objects.isNull(user)) {
return ResponseValue.error("鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
// 鍒濆鍖栧瘑鐮� 123456
String stringValue = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();// 瀵嗘枃
// 1. 淇敼鐢ㄦ埛琛�
// 鐢ㄦ埛琛╥d
- Long sysUserId = finSysTenantUser.getSysUserId();
+ Long sysUserId = user.getSysUserId();
S_user_core userCore = new S_user_core();
userCore.setId(sysUserId);
userCore.setPassword(stringValue);
@@ -678,10 +683,10 @@
*/
@PostMapping("/updRole")
public ResponseValue updRole() {
- FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
- FinSysTenantUser finSysTenantParam = new FinSysTenantUser();
- CommonUtil.copyProperties(user, finSysTenantParam);
- user = finSysTenantParam;
+ FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+ FinSysTenantUserParam tenantUser = new FinSysTenantUserParam();
+ CommonUtil.copyProperties(user, tenantUser);
+ user = tenantUser;
if (user == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
@@ -707,10 +712,10 @@
@PostMapping("/addSupplier")
@Transactional(rollbackFor = Exception.class)
public ResponseValue addSupplier() {
- FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
- FinSysTenantUser finSysTenantParam = new FinSysTenantUser();
- CommonUtil.copyProperties(user, finSysTenantParam);
- user = finSysTenantParam;
+ FinSysTenantUserParam userParam = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+ FinSysTenantUser user = new FinSysTenantUser();
+ CommonUtil.copyProperties(userParam, user);
+
if (user == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
@@ -823,31 +828,31 @@
@PostMapping("/updatePerson")
@Transactional(rollbackFor = Exception.class)
public ResponseValue updatePerson() {
- FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
- FinSysTenantUser finSysTenantParam = new FinSysTenantUser();
- CommonUtil.copyProperties(user, finSysTenantParam);
- user = finSysTenantParam;
- if (user == null) {
+ FinSysTenantUserParam userParam = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+ FinSysTenantUserParam tenantUser = new FinSysTenantUserParam();
+ CommonUtil.copyProperties(userParam, tenantUser);
+ userParam = tenantUser;
+ if (userParam == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
FinSysTenantUser sysInfo = getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- String avatar = user.getAvatar();
+ String avatar = userParam.getAvatar();
if (!picFormatArr.contains(avatar.substring(avatar.lastIndexOf(".")))) {
return ResponseValue.error("澶村儚鏍煎紡涓嶅厑璁�");
}
FinSysTenantUser updUser = new FinSysTenantUser();
updUser.setId(sysInfo.getId());
- updUser.setAvatar(user.getAvatar());
- updUser.setEmail(user.getEmail());
- updUser.setUserName(user.getUserName());
- updUser.setSex(user.getSex());
+ updUser.setAvatar(userParam.getAvatar());
+ updUser.setEmail(userParam.getEmail());
+ updUser.setUserName(userParam.getUserName());
+ updUser.setSex(userParam.getSex());
String encPhone = "";
- if (user.getUserPhone() != null) {
+ if (userParam.getUserPhone() != null) {
String key = PlatformRSAUtils.AES_KEY;
- encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
+ encPhone = AESUtils.encryptStrAES(userParam.getUserPhone(), key);
}
updUser.setUserPhone(encPhone);
// 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER
diff --git a/consum-base/src/main/java/com/consum/base/pojo/FinSysTenantUserSearchParam.java b/consum-base/src/main/java/com/consum/base/pojo/FinSysTenantUserSearchParam.java
index 00c218f..d0327fc 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/FinSysTenantUserSearchParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/FinSysTenantUserSearchParam.java
@@ -2,6 +2,9 @@
import com.walker.web.param.ParamRequest;
+import lombok.Data;
+
+@Data
public class FinSysTenantUserSearchParam extends ParamRequest {
// 鐢ㄦ埛濮撳悕
@@ -15,9 +18,6 @@
private Integer status;
private Long projectId;
-
-
- private String roleId;
// 鐢ㄦ埛鎵嬫満鍙�
private String userPhone;
@@ -39,116 +39,4 @@
private Long sysUserId;
- public Long getUserId() {
- return userId;
- }
-
- public void setUserId(Long userId) {
- this.userId = userId;
- }
-
- public Long getSysUserId() {
- return sysUserId;
- }
-
- public void setSysUserId(Long sysUserId) {
- this.sysUserId = sysUserId;
- }
-
- public Long getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Long startTime) {
- this.startTime = startTime;
- }
-
- public Long getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Long endTime) {
- this.endTime = endTime;
- }
-
- public Integer getCtiStatus() {
- return ctiStatus;
- }
-
- public void setCtiStatus(Integer ctiStatus) {
- this.ctiStatus = ctiStatus;
- }
-
- public Long getProjectId() {
- return projectId;
- }
-
- public void setProjectId(Long projectId) {
- this.projectId = projectId;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getRoleId() {
- return roleId;
- }
-
- public void setRoleId(String roleId) {
- this.roleId = roleId;
- }
-
- public String getUserCode() {
- return userCode;
- }
-
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
- public void setUserCode(String userCode) {
- this.userCode = userCode;
- }
-
- public long getTenantCode() {
- return tenantCode;
- }
-
- public void setTenantCode(long tenantCode) {
- this.tenantCode = tenantCode;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getUserPhone() {
- return userPhone;
- }
-
- public void setUserPhone(String userPhone) {
- this.userPhone = userPhone;
- }
-
-
- public Long getSupplierId() {
- return supplierId;
- }
-
- public void setSupplierId(Long supplierId) {
- this.supplierId = supplierId;
- }
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/request/FinSysTenantUserParam.java b/consum-base/src/main/java/com/consum/base/pojo/request/FinSysTenantUserParam.java
new file mode 100644
index 0000000..9ca8f5f
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/request/FinSysTenantUserParam.java
@@ -0,0 +1,89 @@
+package com.consum.base.pojo.request;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: TODO
+ * @date 2023/12/6 13:37
+ */
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FinSysTenantUserParam {
+
+ // 涓婚敭
+ private Long id;
+
+ // 灞炴�у垪琛�
+ private String userName;
+
+ private String userCode;
+
+ private String tenantId;
+
+ private String createBy;
+
+ private Long createTime;
+
+ private String updateBy;
+
+ private Long updateTime;
+
+ private Integer sex;
+
+ private Integer status;
+
+ private Long seq;
+
+ private String remark;
+
+ private Long sysUserId;
+
+ private Long sysDeptId;
+
+ private String tenantCode;
+
+ private String userPhone;
+
+ private Integer isDelete;
+
+ private Integer kfStatus;
+
+ private String agentJid;
+
+ private String workgroupJid;
+
+ private String clientNumber;
+
+ private String clientPwd;
+
+ private Long supplierId;
+
+ private String tenantName;
+
+ private Integer lv;
+
+ @JsonIgnore
+ private String roleStr;
+
+ private String avatar;
+
+ private String email;
+
+ @JsonIgnore
+ private List<Long> roleList;
+
+ private Boolean isOnline;
+
+ private String parentCode;
+
+ // 鏄惁涓鸿繍缁村晢 濡傛灉鏈夎繍缁村晢id 鍒欎唬琛ㄦ槸锛屽弽涔嬩笉鏄�
+ private String isSupplier;
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java
index b802998..1f1557a 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java
@@ -1,7 +1,13 @@
package com.consum.base.service;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
import com.consum.base.pojo.FinSysTenantUserSearchParam;
-import com.consum.model.po.FinSysOrg;
import com.consum.model.po.FinSysTenantUser;
import com.iplatform.base.util.PlatformRSAUtils;
import com.iplatform.core.util.AESUtils;
@@ -10,46 +16,35 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.springframework.stereotype.Service;
@Service
public class FinSysTenantUserServiceImpl extends BaseServiceImpl {
- private static final String SQL_GET_USER = "SELECT * FROM fin_sys_tenant_user WHERE IS_DELETE = 0 AND `STATUS` = 1 AND TENANT_ID = ?";
- private static final String SQL_QH_PAGE_USER_PREFIX = "select fstu.* from FIN_SYS_TENANT_USER fstu where fstu.IS_DELETE = 0 ";
- private static final String SQL_QH_PAGE_USER_PREFIX_NEW = "select fstu.* from FIN_SYS_TENANT_USER fstu where IS_DELETE = 0 and status=1 ";
- private static final String SQL_TENANT_USER = "select fstu.*, fst.TENANT_NAME, fst.LV from FIN_SYS_TENANT_USER fstu\n"
- + "left join (SELECT CODE, NAME AS TENANT_NAME, LV FROM FIN_SYS_TENANT) fst ON fstu.TENANT_CODE = fst.CODE\n" + "where fstu.SYS_USER_ID = ?";
- private static final String SQL_TENANT_USER_BY_USER_ID = "select * from FIN_SYS_TENANT_USER where SYS_USER_ID = ? AND STATUS = 1";
- private static final String SQL_INSERT_ROLE_USER = "insert into s_role_user(user_id, role_id, org_id) values(?,?,0)";
+ private static final String SQL_GET_USER =
+ "SELECT * FROM fin_sys_tenant_user WHERE IS_DELETE = 0 AND `STATUS` = 1 AND TENANT_ID = ?";
+ private static final String SQL_QH_PAGE_USER_PREFIX =
+ "select fstu.* from FIN_SYS_TENANT_USER fstu where fstu.IS_DELETE = 0 ";
+
+ private static final String SQL_TENANT_USER =
+ "select fstu.*, fst.TENANT_NAME, fst.LV from FIN_SYS_TENANT_USER fstu\n"
+ + "left join (SELECT CODE, NAME AS TENANT_NAME, LV FROM FIN_SYS_TENANT) fst ON fstu.TENANT_CODE = fst.CODE\n"
+ + "where fstu.SYS_USER_ID = ?";
+
+ private static final String SQL_INSERT_ROLE_USER =
+ "insert into s_role_user(user_id, role_id, org_id) values(?,?,0)";
private static final String SQL_DELETE_ROLE_USER = "DELETE FROM S_ROLE_USER WHERE USER_ID =?";
/**
* 鏍规嵁鐢ㄦ埛id鍜岃鑹瞚d鍒犻櫎瑙掕壊
*/
- private static final String SQL_DELETE_ROLE_BY_USER_ID_AND_ROLE_ID = "DELETE FROM S_ROLE_USER WHERE USER_ID =? AND role_id =?";
+ private static final String SQL_DELETE_ROLE_BY_USER_ID_AND_ROLE_ID =
+ "DELETE FROM S_ROLE_USER WHERE USER_ID =? AND role_id =?";
private static final String SQL_SELECT_USER_CODE = "SELECT * FROM FIN_SYS_TENANT_USER where 1 = 1 ";
private static final String SQL_SELECT_USER_ID = "SELECT * FROM S_ROLE where 1=1 ";
private static final String SQL_DEPT_ROLES = "select * from s_dept where status=0 and del_flag=0";
-
- private static final String SQL_FIN_SYS_ORG = "SELECT * from FIN_SYS_ORG where ID=?";
-
-
- private static final String SQL_TENANT_KF_USER = "select fstu.*, sru.USER_ID from FIN_SYS_TENANT_USER fstu\n"
- + "left join (select USER_ID FROM S_ROLE_USER WHERE ROLE_ID = '1690961420053') sru ON fstu.SYS_USER_ID = sru.USER_ID\n"
- + "WHERE IS_DELETE = 0 AND STATUS = 1 AND sru.USER_ID is NOT NULL AND TENANT_CODE = ?";
-
- private static final String SQL_TEAM_KF_USER = "select fstu.*, sru.USER_ID,FST2.CODE as PARENT_Code from FIN_SYS_TENANT_USER fstu\n"
- + " left join (select USER_ID FROM S_ROLE_USER WHERE ROLE_ID = 2) sru ON fstu.SYS_USER_ID = sru.USER_ID\n"
- + " LEFT JOIN FIN_SYS_TENANT FST ON FST.CODE = fstu.TENANT_CODE \n" + " LEFT JOIN FIN_SYS_TENANT FST2 ON FST2.ID = FST.PARENT_ID \n"
- + " WHERE IS_DELETE = 0 AND STATUS = 1 AND sru.USER_ID is NOT NULL AND fstu.ID != ?";
/**
* @Description 鍒嗛〉鏌ヨ绯荤粺鐢ㄦ埛
@@ -75,19 +70,19 @@
sql.append(" and USER_CODE like :USER_CODE");
parameter.put("USER_CODE", StringUtils.CHAR_PERCENT + param.getUserCode() + StringUtils.CHAR_PERCENT);
}
-// if(StringUtils.isNotEmpty(param.getUserCode())){
-// sql.append(" and user_code like :user_code");
-// parameter.put("user_code", StringUtils.CHAR_PERCENT + param.getUserCode() + StringUtils.CHAR_PERCENT);
-// }
+ // if(StringUtils.isNotEmpty(param.getUserCode())){
+ // sql.append(" and user_code like :user_code");
+ // parameter.put("user_code", StringUtils.CHAR_PERCENT + param.getUserCode() + StringUtils.CHAR_PERCENT);
+ // }
if (param.getStatus() != null) {
sql.append(" and status =:status");
parameter.put("status", param.getStatus());
}
-// if(param.getRoleId()!=null &&!param.getRoleId().equals("")){
-// sql.append(" and fstu.SYS_USER_ID in (select user_id from s_role_user where role_id = :role_id)");
-// parameter.put("role_id", param.getRoleId());
-// }
+ // if(param.getRoleId()!=null &&!param.getRoleId().equals("")){
+ // sql.append(" and fstu.SYS_USER_ID in (select user_id from s_role_user where role_id = :role_id)");
+ // parameter.put("role_id", param.getRoleId());
+ // }
if (StringUtils.isNotEmpty(param.getUserPhone())) {
sql.append(" and USER_PHONE =:userPhone");
@@ -103,13 +98,13 @@
// 杩欓噷鏄�夋嫨浜哄憳鍔犵殑
if (param.getType() != null) {
- // 1 鏄储鏀跨敤鎴� 2 渚涘簲鍟� 浠栦咯鐨勫尯鍒氨鏄� 渚涘簲鍟唅d鏄惁涓虹┖
+ // 1 鏄储鏀跨敤鎴� 2 渚涘簲鍟� 浠栦咯鐨勫尯鍒氨鏄� 渚涘簲鍟唅d鏄惁涓虹┖
if (param.getType() == 1) {
sql.append(" and fstu.supplier_Id is null ");
}
if (param.getType() == 2) {
- //杩欓噷鏄� 鏌ョ殑渚涘簲鍟� 渚涘簲鍟唅d 宸茬粡鍦ㄤ笂闈㈠姞杩囦簡
+ // 杩欓噷鏄� 鏌ョ殑渚涘簲鍟� 渚涘簲鍟唅d 宸茬粡鍦ㄤ笂闈㈠姞杩囦簡
}
}
// 缁戝畾CTI瀹㈡湇
@@ -118,68 +113,6 @@
sql.append(" and fstu.AGENT_JID is not null ");
} else {
sql.append(" and fstu.AGENT_JID is null ");
- }
- }
- sql.append(" ORDER BY SEQ asc ,CREATE_TIME desc");
- return this.selectSplit(sql.toString(), parameter, new FinSysTenantUser());
- }
-
-
- /**
- * @Description 鍒嗛〉鏌ヨ绯荤粺鐢ㄦ埛
- * @Author wh
- * @Date 2023/7/17 14:26
- */
- public GenericPager<FinSysTenantUser> queryAllPageUserNew(FinSysTenantUserSearchParam param) {
- Map<String, Object> parameter = new HashMap<>(5);
- StringBuilder sql = new StringBuilder(SQL_QH_PAGE_USER_PREFIX_NEW);
- if (param.getTenantCode() > 0) {
- sql.append(" and fstu.TENANT_CODE =:tenantCode");
- parameter.put("tenantCode", param.getTenantCode());
- }
- if (param.getSupplierId() != null) {
- sql.append(" and fstu.supplier_Id =:supplier_Id");
- parameter.put("supplier_Id", param.getSupplierId());
- }
- if (StringUtils.isNotEmpty(param.getUserName())) {
- sql.append(" and USER_NAME like :userName");
- parameter.put("userName", StringUtils.CHAR_PERCENT + param.getUserName() + StringUtils.CHAR_PERCENT);
- }
- if (StringUtils.isNotEmpty(param.getUserCode())) {
- sql.append(" and user_code like :user_code");
- parameter.put("user_code", StringUtils.CHAR_PERCENT + param.getUserCode() + StringUtils.CHAR_PERCENT);
- }
- if (param.getStatus() != null) {
- sql.append(" and status like :status");
- parameter.put("status", param.getStatus());
- }
-
- if (param.getRoleId() != null && !param.getRoleId().equals("")) {
- sql.append(" and fstu.SYS_USER_ID in (select user_id from s_role_user where role_id = :role_id)");
- parameter.put("role_id", param.getRoleId());
- }
-
- if (StringUtils.isNotEmpty(param.getUserPhone())) {
- sql.append(" and USER_PHONE =:userPhone");
- try {
- // 鍔犲瘑鎵嬫満鍙�
- String key = PlatformRSAUtils.AES_KEY;
- parameter.put("userPhone", AESUtils.encryptStrAES(param.getUserPhone(), key));
- } catch (Exception e) {
- log.error("鎵嬫満鍙峰姞瀵嗗け璐ワ紝 鍘熷洜鏄細" + e.getMessage());
- parameter.put("userPhone", "");
- }
- }
-
- // 杩欓噷鏄�夋嫨浜哄憳鍔犵殑
- if (param.getType() != null) {
- // 1 鏄储鏀跨敤鎴� 2 渚涘簲鍟� 浠栦咯鐨勫尯鍒氨鏄� 渚涘簲鍟唅d鏄惁涓虹┖
- if (param.getType() == 1) {
- sql.append(" and fstu.supplier_Id is null ");
- }
-
- if (param.getType() == 2) {
- //杩欓噷鏄� 鏌ョ殑渚涘簲鍟� 渚涘簲鍟唅d 宸茬粡鍦ㄤ笂闈㈠姞杩囦簡
}
}
sql.append(" ORDER BY SEQ asc ,CREATE_TIME desc");
@@ -197,7 +130,8 @@
}
public FinSysTenantUser queryOneByUserId(String userId) {
- List<FinSysTenantUser> finSysTenantUserList = this.select(SQL_TENANT_USER, new Object[]{userId}, new FinSysTenantUser());
+ List<FinSysTenantUser> finSysTenantUserList =
+ this.select(SQL_TENANT_USER, new Object[] {userId}, new FinSysTenantUser());
if (finSysTenantUserList.size() > 0) {
return finSysTenantUserList.get(0);
} else {
@@ -268,7 +202,6 @@
this.execBatchUpdate(SQL_DELETE_ROLE_BY_USER_ID_AND_ROLE_ID, parameters);
}
-
/**
* 鏍规嵁userCode鏌ヨ閲嶅銆�
*
@@ -326,91 +259,11 @@
}
/**
- * @Description 鑾峰彇瀹㈡湇
- * @Author wh
- * @Date 2023/7/19 10:12
- */
- public List<FinSysTenantUser> selectKF(String tenantCode) {
- // 鏌ヨ瑙掕壊涓哄鏈嶄笖鏈烘瀯鍜屽綋鍓嶈姹傜敤鎴蜂竴鑷寸殑
- return this.select(SQL_TENANT_KF_USER, new Object[]{tenantCode}, new FinSysTenantUser());
- }
-// public FinSysTenantUser selectKF(String tenantCode) {
-// // 鏌ヨ瑙掕壊涓哄鏈嶄笖鏈烘瀯鍜屽綋鍓嶈姹傜敤鎴蜂竴鑷寸殑
-// List<FinSysTenantUser> finSysTenantUserList = this.select(SQL_TENANT_KF_USER, new Object[]{tenantCode}, new FinSysTenantUser());
-// if (finSysTenantUserList.size() > 0) {
-// return finSysTenantUserList.get(0);
-// } else {
-// return null;
-// }
-// }
-
- /**
- * @Description 鑾峰彇鎵�鏈夊鏈嶄俊鎭紝涓嶅寘鍚嚜宸�
- * @Author wh
- * @Date 2023/7/20 15:33
- */
- public List<FinSysTenantUser> selectTeamKF(Long id) {
- // 鏌ヨ瑙掕壊涓哄鏈嶄笖鏈烘瀯鍜屽綋鍓嶈姹傜敤鎴蜂竴鑷寸殑
- List<FinSysTenantUser> finSysTenantUserList = this.select(SQL_TEAM_KF_USER, new Object[]{id}, new FinSysTenantUser());
- return finSysTenantUserList;
- }
-
- /**
- * 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
- *
- * @param orgId
- * @return
- */
- public List<FinSysOrg> selectFinSysOrg(String orgId) {
- List<FinSysOrg> select = this.select(SQL_FIN_SYS_ORG, new Object[]{orgId}, new FinSysOrg());
- return select;
- }
-
- public FinSysTenantUser queryBySysUserId(Long userId) {
- List<FinSysTenantUser> select = this.select(SQL_TENANT_USER_BY_USER_ID, new Object[]{userId}, new FinSysTenantUser());
- if (StringUtils.isEmptyList(select)) {
- return null;
- } else {
- return select.get(0);
- }
- }
-
- private static final String SQL_GET_ALL_USER = "select DISTINCT( fstu.sys_user_id), fstu.USER_NAME as USER_Name, fstu.id as Id from (\n"
- + "SELECT DISTINCT(CREATE_BY), EVENT_MANAGE_ID FROM FIN_EVENT_MANAGE_RECORD) femr LEFT JOIN FIN_SYS_TENANT_USER fstu ON femr.CREATE_BY = fstu.ID\n"
- + "LEFT JOIN FIN_EVENT_MANAGE fem ON fem.id = femr.EVENT_MANAGE_ID WHERE USER_NAME is not NULL ";
-
- /**
- * @Description 鏌ヨ鏁版嵁缁熻鐨勪俊鎭�
- * @Author wh
- * @Date 2023/9/5 11:53
- */
- public List<FinSysTenantUser> getStatics(FinSysTenantUserSearchParam finSysTenantUserSearchParam) {
- Map<String, Object> parameters = new HashMap<>(10);
- StringBuilder sql = new StringBuilder(SQL_GET_ALL_USER);
- sql.append(" and fem.PROJECT_ID = :projectId");
- parameters.put("projectId", finSysTenantUserSearchParam.getProjectId());
- if (StringUtils.isNotEmpty(finSysTenantUserSearchParam.getUserName())) {
- sql.append(" and fstu.USER_NAME like :userName");
- parameters.put("userName", StringUtils.CHAR_PERCENT + finSysTenantUserSearchParam.getUserName() + StringUtils.CHAR_PERCENT);
- }
- if (finSysTenantUserSearchParam.getStartTime() != null && finSysTenantUserSearchParam.getStartTime() > 0) {
- sql.append(" and fem.create_time >= :startTime");
- parameters.put("startTime", finSysTenantUserSearchParam.getStartTime());
- }
- if (finSysTenantUserSearchParam.getEndTime() != null && finSysTenantUserSearchParam.getEndTime() > 0) {
- sql.append(" and fem.create_time <= :endTime");
- parameters.put("endTime", finSysTenantUserSearchParam.getEndTime());
- }
- sql.append(" ORDER BY ID DESC");
- return this.select(sql.toString(), parameters, new FinSysTenantUser());
- }
-
- /**
* @Description 鏍规嵁OrgId鑾峰彇鐢ㄦ埛淇℃伅
* @Author wh
* @Date 2023/10/4 15:49
*/
public List<FinSysTenantUser> getByOrgId(Long orgId) {
- return this.select(SQL_GET_USER, new Object[]{orgId}, new FinSysTenantUser());
+ return this.select(SQL_GET_USER, new Object[] {orgId}, new FinSysTenantUser());
}
}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser.java b/consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser.java
index 01c39c7..9498d94 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser.java
@@ -109,7 +109,7 @@
@JsonIgnore
protected boolean isset_clientPwd = false;
- private Long supplierId = null;
+ private Long supplierId = null;
@JsonIgnore
protected boolean isset_supplierId = false;
@@ -129,9 +129,11 @@
private String avatar = null;
@JsonIgnore
protected boolean isset_avatar = false;
+
public String getAvatar() {
return avatar;
}
+
private String email = null;
@JsonIgnore
protected boolean isset_email = false;
@@ -156,12 +158,10 @@
public void setSupplierId(Long supplierId) {
this.supplierId = supplierId;
- this.isset_supplierId=true;
+ this.isset_supplierId = true;
}
private List<Long> roleList = null;
-
-
public List<Long> getRoleList() {
return roleList;
@@ -179,7 +179,7 @@
@JsonIgnore
protected boolean isset_parentCode = false;
- private String isSupplier; //鏄惁涓鸿繍缁村晢 濡傛灉鏈夎繍缁村晢id 鍒欎唬琛ㄦ槸锛屽弽涔嬩笉鏄�
+ private String isSupplier; // 鏄惁涓鸿繍缁村晢 濡傛灉鏈夎繍缁村晢id 鍒欎唬琛ㄦ槸锛屽弽涔嬩笉鏄�
public String getIsSupplier() {
return isSupplier;
@@ -192,8 +192,7 @@
/**
* 榛樿鏋勯�犲嚱鏁�
*/
- public FinSysTenantUser() {
- }
+ public FinSysTenantUser() {}
/**
* 鏍规嵁涓婚敭鏋勯�犲璞�
@@ -216,7 +215,7 @@
*/
@Override
public void setPkValue(Object value) {
- this.setId((Long) value);
+ this.setId((Long)value);
}
public Long getId() {
@@ -568,14 +567,11 @@
this.isset_parentCode = true;
}
-
-
- //roleStr
+ // roleStr
@JsonIgnore
public boolean isEmptRoleStr() {
return this.roleStr == null;
}
-
public String getRoleStr() {
return this.roleStr;
@@ -586,51 +582,31 @@
this.isset_roleStr = true;
}
-
-
@JsonIgnore
public boolean isEmptLv() {
return this.lv == null;
}
-
/**
* 閲嶅啓 toString() 鏂规硶
*/
@Override
public String toString() {
- return new StringBuilder()
- .append("id=").append(this.id)
- .append("userName=").append(this.userName)
- .append("userCode=").append(this.userCode)
- .append("tenantId=").append(this.tenantId)
- .append("createBy=").append(this.createBy)
- .append("createTime=").append(this.createTime)
- .append("updateBy=").append(this.updateBy)
- .append("updateTime=").append(this.updateTime)
- .append("sex=").append(this.sex)
- .append("status=").append(this.status)
- .append("seq=").append(this.seq)
- .append("remark=").append(this.remark)
- .append("sysUserId=").append(this.sysUserId)
- .append("sysDeptId=").append(this.sysDeptId)
- .append("tenantCode=").append(this.tenantCode)
- .append("userPhone=").append(this.userPhone)
- .append("isDelete=").append(this.isDelete)
- .append("kfStatus=").append(this.kfStatus)
- .append("agentJid=").append(this.agentJid)
- .append("workgroupJid=").append(this.workgroupJid)
- .append("clientNumber=").append(this.clientNumber)
- .append("clientPwd=").append(this.clientPwd)
- .append("tenantName=").append(this.tenantName)
- .append("lv=").append(this.lv)
- .append("isOnline=").append(this.isOnline)
- .append("parentCode=").append(this.parentCode)
- .append("supplierId=").append(this.supplierId)
- .append("roleStr=").append(this.roleStr)
+ return new StringBuilder().append("id=").append(this.id).append("userName=").append(this.userName)
+ .append("userCode=").append(this.userCode).append("tenantId=").append(this.tenantId).append("createBy=")
+ .append(this.createBy).append("createTime=").append(this.createTime).append("updateBy=")
+ .append(this.updateBy).append("updateTime=").append(this.updateTime).append("sex=").append(this.sex)
+ .append("status=").append(this.status).append("seq=").append(this.seq).append("remark=").append(this.remark)
+ .append("sysUserId=").append(this.sysUserId).append("sysDeptId=").append(this.sysDeptId)
+ .append("tenantCode=").append(this.tenantCode).append("userPhone=").append(this.userPhone)
+ .append("isDelete=").append(this.isDelete).append("kfStatus=").append(this.kfStatus).append("agentJid=")
+ .append(this.agentJid).append("workgroupJid=").append(this.workgroupJid).append("clientNumber=")
+ .append(this.clientNumber).append("clientPwd=").append(this.clientPwd).append("tenantName=")
+ .append(this.tenantName).append("lv=").append(this.lv).append("isOnline=").append(this.isOnline)
+ .append("parentCode=").append(this.parentCode).append("supplierId=").append(this.supplierId)
+ .append("roleStr=").append(this.roleStr)
-
- .toString();
+ .toString();
}
/**
@@ -640,7 +616,7 @@
FinSysTenantUser fin_sys_tenant_user = new FinSysTenantUser();
// 鏁版嵁搴撳悕绉�
- //fin_sys_tenant_user.setDatabaseName_(this.getDatabaseName_());
+ // fin_sys_tenant_user.setDatabaseName_(this.getDatabaseName_());
// 涓婚敭
if (this.isset_id) {
@@ -734,9 +710,6 @@
if (this.isset_roleStr) {
fin_sys_tenant_user.setRoleStr(this.getRoleStr());
}
-
-
-
return fin_sys_tenant_user;
}
--
Gitblit v1.9.1