ソースを参照

用户添加字段

yzc 1 年間 前
コミット
19a33be716

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

@@ -12,6 +12,7 @@ import com.ruoyi.common.xss.Xss;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -192,6 +193,19 @@ public class SysUser extends BaseEntity {
      */
     private String accountNumber;
 
+    /**
+     * 采购范围
+     */
+    private String purchaseRange;
+    /**
+     * 业务员等级
+     */
+    private Long saleLv;
+    /**
+     * 身份
+     */
+    private Integer identity;
+
 
     //==================================================
 
@@ -216,6 +230,30 @@ public class SysUser extends BaseEntity {
     //================================================================
 
 
+    public Integer getIdentity() {
+        return identity;
+    }
+
+    public void setIdentity(Integer identity) {
+        this.identity = identity;
+    }
+
+    public String getPurchaseRange() {
+        return purchaseRange;
+    }
+
+    public void setPurchaseRange(String purchaseRange) {
+        this.purchaseRange = purchaseRange;
+    }
+
+    public Long getSaleLv() {
+        return saleLv;
+    }
+
+    public void setSaleLv(Long saleLv) {
+        this.saleLv = saleLv;
+    }
+
     public String getAccountName() {
         return accountName;
     }

+ 21 - 5
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -34,6 +34,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="accountName"     column="account_name"	  />
 		<result property="accountBank"     column="account_bank"	  />
 		<result property="accountNumber"     column="account_number"	  />
+		<result property="purchaseRange"     column="purchase_range"	  />
+		<result property="saleLv"     column="sale_lv"	  />
+		<result property="identity"     column="identity"	  />
 		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
 	</resultMap>
@@ -82,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   u.company_id,
 			   u.company_id as ofCompanyId,
 			   u.company_set,
+			   u.account_name,u.account_bank,u.account_number,u.purchase_range,u.sale_lv,u.identity,
 			   d.dept_id,
 			   d.parent_id,
 			   d.ancestors,
@@ -108,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		u.user_id, u.dept_id, u.nick_name, u.nick_name_en, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
 		u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader_id,
 		d.director_id, d.type,u.job_number,u.user_type,u.tenant_id,u.user_code,u.company_id,u.company_set,
-		u.account_name,u.account_bank,u.account_number
+		u.account_name,u.account_bank,u.account_number,u.purchase_range,u.sale_lv,u.identity
 		from
 		sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -159,6 +163,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="companyId != null">
 			AND u.company_id = #{companyId}
 		</if>
+		<if test="identity != null">
+			AND u.identity = #{identity}
+		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
@@ -337,7 +344,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="accountName != null and accountName != ''">account_name,</if>
 		<if test="accountBank != null and accountBank != ''">account_bank,</if>
 		<if test="accountNumber != null and accountNumber != ''">account_number,</if>
-        create_time
+		<if test="purchaseRange != null and purchaseRange != ''">purchase_range,</if>
+		<if test="saleLv != null">sale_lv,</if>
+		<if test="identity != null">identity,</if>
+		create_time
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
         <if test="deptId != null and deptId != ''">#{deptId},</if>
@@ -361,6 +371,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="accountName != null and accountName != ''">#{accountName},</if>
 		<if test="accountBank != null and accountBank != ''">#{accountBank},</if>
 		<if test="accountNumber != null and accountNumber != ''">#{accountNumber},</if>
+		<if test="purchaseRange != null and purchaseRange != ''">#{purchaseRange},</if>
+		<if test="saleLv != null">#{saleLv},</if>
+		<if test="identity != null">#{identity},</if>
 		sysdate()
         )
     </insert>
@@ -390,9 +403,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
 			<if test="companySet != null and companySet != ''">company_set = #{companySet},</if>
 
-			<if test="accountName != null and accountName != ''">account_name = #{accountName},</if>
-			<if test="accountBank != null and accountBank != ''">account_bank = #{accountBank},</if>
-			<if test="accountNumber != null and accountNumber != ''">account_number = #{accountNumber},</if>
+			<if test="accountName != null">account_name = #{accountName},</if>
+			<if test="accountBank != null">account_bank = #{accountBank},</if>
+			<if test="accountNumber != null">account_number = #{accountNumber},</if>
+			<if test="purchaseRange != null">purchase_range = #{purchaseRange},</if>
+			<if test="saleLv != null">sale_lv = #{saleLv},</if>
+			<if test="identity != null">identity = #{identity},</if>
 			update_time = sysdate()
         </set>
         where user_id = #{userId}