浏览代码

修改部门实体类

yum 4 年之前
父节点
当前提交
746fef74d4

+ 5 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -264,7 +264,11 @@ public class SysUserController {
             System.err.println("公司信息:" + userCompany);
             System.err.println("公司信息:" + userCompany);
             String companyId = userCompany.getCompanyId();
             String companyId = userCompany.getCompanyId();
             List<SysUserVo> userList;
             List<SysUserVo> userList;
-            if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
+            if ("4b10089775c040119e139087517aed88".equals(companyId) || ("" +
+                    "" +
+                    "" +
+                    "" +
+                    "").equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
                 userList = sysUserService.getAllUser(userName, null);
                 userList = sysUserService.getAllUser(userName, null);
             } else {
             } else {
                 userList = sysUserService.getUserListByCompany(companyId, userName);
                 userList = sysUserService.getUserListByCompany(companyId, userName);

+ 3 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/SysUserDepart.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
+import java.util.Date;
 
 
 @Data
 @Data
 @TableName("sys_user_depart")
 @TableName("sys_user_depart")
@@ -19,6 +20,8 @@ public class SysUserDepart implements Serializable {
 	private String userId;
 	private String userId;
 	/**部门id*/
 	/**部门id*/
 	private String depId;
 	private String depId;
+	private Date createTime;
+	private Date updateTime;
 	public SysUserDepart(String id, String userId, String depId) {
 	public SysUserDepart(String id, String userId, String depId) {
 		super();
 		super();
 		this.id = id;
 		this.id = id;