用户添加归属公司字段

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -8,8 +8,6 @@ import com.ruoyi.common.annotation.Excel.Type;
 import com.ruoyi.common.annotation.Excels;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.xss.Xss;
-import lombok.Getter;
-import lombok.Setter;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
@@ -23,8 +21,6 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@Getter
-@Setter
 public class SysUser extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -193,9 +189,26 @@ public class SysUser extends BaseEntity {
 
     private Long companyId;
 
+    private
     @TableField(exist = false)
     List<String> deptNameList;
 
+    public List<String> getDeptNameList() {
+        return deptNameList;
+    }
+
+    public void setDeptNameList(List<String> deptNameList) {
+        this.deptNameList = deptNameList;
+    }
+
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
 
     public SysUser() {
 

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -57,7 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND d.dept_name like concat('%', #{deptName}, '%')
 		</if>
 		<if test="status != null and status != ''">
-			AND sd.tatus = #{status}
+			AND d.status = #{status}
+		</if>
+		<if test="type != null and type != ''">
+			AND d.type = #{type}
 		</if>
 <!--		<if test="tenantId != null and tenantId != ''">-->
 <!--			AND d.tenant_id = #{tenantId}-->

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -28,7 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="jobNumber"    column="job_number"	  />
 		<result property="userCode" column="user_code"/>
 		<result property="userType"     column="user_type"	  />
-        <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
+		<result property="companyId"     column="company_id"	  />
+		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
 	</resultMap>
 	
@@ -73,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   u.remark,
 			   u.tenant_id,
 			   u.user_code,
+			   u.company_id,
 			   d.dept_id,
 			   d.parent_id,
 			   d.ancestors,