Merge remote-tracking branch 'origin/master'

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/domain/dto/DeptImportDTO.java

@@ -14,50 +14,50 @@ import lombok.Data;
 public class DeptImportDTO {
 
     /** 组织名称 */
-    @Excel(name = "组织名称")
+    @Excel(name = "*组织名称")
     private String deptName;
 
     /** 组织编码 */
-    @Excel(name = "组织编码")
+    @Excel(name = "*组织编码")
     private String deptCode;
 
     /** 父组织名称 */
-    @Excel(name = "父组织名称")
+    @Excel(name = "*父组织名称")
     private String parentDeptName;
 
     /** 父组织编码 */
-    @Excel(name = "父组织编码")
+    @Excel(name = "*父组织编码")
     private String parentDeptCode;
 
     /** 负责人手机号 */
-    @Excel(name = "负责人手机号")
+    @Excel(name = "*负责人手机号")
     private String phone;
 
     /** 负责人姓名 */
-    @Excel(name = "负责人姓名")
+    @Excel(name = "*负责人姓名")
     private String leader;
 
     /** 费率 */
-    @Excel(name = "费率")
+    @Excel(name = "*费率")
     private String rateValue;
 
     /** 发票抬头 */
-    @Excel(name = "发票抬头")
+    @Excel(name = "*发票抬头")
     private String invoiceName;
 
     /** 纳税人识别号 */
-    @Excel(name = "纳税人识别号")
+    @Excel(name = "*纳税人识别号")
     private String invoiceNum;
 
     /** 地址 */
-    @Excel(name = "地址")
+    @Excel(name = "*地址")
     private String companyAddress;
 
     /** 开户银行 */
-    @Excel(name = "开户银行")
+    @Excel(name = "*开户银行")
     private String openBank;
 
     /** 银行账号 */
-    @Excel(name = "银行账号")
+    @Excel(name = "*银行账号")
     private String bankAccount;
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/domain/dto/UserImportDTO.java

@@ -12,27 +12,27 @@ import lombok.Data;
 public class UserImportDTO {
 
     /** 手机号 */
-    @Excel(name = "手机号")
+    @Excel(name = "*手机号")
     private String phonenumber;
 
     /** 姓名 */
-    @Excel(name = "姓名")
+    @Excel(name = "*姓名")
     private String nickName;
 
     /** 工号 */
-    @Excel(name = "工号")
+    @Excel(name = "*工号")
     private String employeeCode;
 
     /** 用户角色名称 */
-    @Excel(name = "用户角色")
+    @Excel(name = "用户角色", defaultValue = "员工", combo = {"员工", "部门管理员", "瑞鲸管理员"})
     private String roleName;
 
     /** 组织名称 */
-    @Excel(name = "组织名称")
+    @Excel(name = "*组织名称")
     private String deptName;
 
     /** 组织编码 */
-    @Excel(name = "组织编码")
+    @Excel(name = "*组织编码")
     private String deptCode;
 
     /** 邮箱 */

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -26,11 +26,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="openBank" column="open_bank" />
 		<result property="bankAccount" column="bank_account" />
 		<result property="companyAddress" column="company_address" />
+        <result property="deptCode" column="dept_code" />
 	</resultMap>
 	
 	<sql id="selectDeptVo">
         select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time,
-        d.invoice_name, d.invoice_num, d.rate_value, d.open_bank, d.bank_account, d.company_address
+        d.invoice_name, d.invoice_num, d.rate_value, d.open_bank, d.bank_account, d.company_address, d.dept_code
         from sys_dept d
     </sql>
     
@@ -46,6 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="deptName != null and deptName != ''">
 			AND dept_name like concat('%', #{deptName}, '%')
 		</if>
+		<if test="deptCode != null and deptCode != ''">
+			AND dept_code like concat('%', #{deptCode}, '%')
+		</if>
 		<if test="status != null and status != ''">
 			AND status = #{status}
 		</if>
@@ -110,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   			<if test="openBank != null and openBank != ''">open_bank,</if>
   			<if test="bankAccount != null and bankAccount != ''">bank_account,</if>
   			<if test="companyAddress != null and companyAddress != ''">company_address,</if>
+            <if test="deptCode != null and deptCode != ''">#{deptCode},</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -128,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   			<if test="openBank != null and openBank != ''">#{openBank},</if>
   			<if test="bankAccount != null and bankAccount != ''">#{bankAccount},</if>
   			<if test="companyAddress != null and companyAddress != ''">#{companyAddress},</if>
+            <if test="deptCode != null and deptCode != ''">#{deptCode},</if>
  			sysdate()
  		)
 	</insert>
@@ -150,6 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="openBank != null and openBank != ''">open_bank = #{openBank},</if>
             <if test="bankAccount != null and bankAccount != ''">bank_account = #{bankAccount},</if>
             <if test="companyAddress != null and companyAddress != ''">company_address = #{companyAddress},</if>
+            <if test="deptCode != null and deptCode != ''">dept_code = #{deptCode},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}