用户表和企业表添加字段

ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml

@@ -37,22 +37,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="legalPerson"    column="legal_person"    />
         <result property="legalIdCard"    column="legal_id_card"    />
         <result property="legalPhone"    column="legal_phone"    />
+        <result property="regionCode"    column="region_code"    />
+        <result property="regionName"    column="region_name"    />
 
     </resultMap>
 
     <sql id="selectCompanyVo">
-        select company_id, name, location, industry, scale, del_flag, create_by, create_time, update_by, update_time, remark,code,description,nature,total_recruitment,registered_address,contact_person,contact_person_phone,is_abnormal,not_pass_reason,status,case when status='2' then update_time else null end reject_time,is_imp_company,imp_company_type,enterprise_type,legal_person,legal_id_card,legal_phone from company
+        select company_id, name, location, industry, scale, del_flag, create_by, create_time, update_by, update_time, remark,code,description,nature,total_recruitment,registered_address,contact_person,contact_person_phone,is_abnormal,not_pass_reason,status,case when status='2' then update_time else null end reject_time,is_imp_company,imp_company_type,enterprise_type,legal_person,legal_id_card,legal_phone,region_code,region_name from company
     </sql>
         <insert id="batchInsert" parameterType="java.util.List">
             INSERT INTO company (
             name, location, industry, scale, code, description, nature,
-            create_by, create_time, del_flag
+            create_by, create_time, del_flag,region_name,region_code
             ) VALUES
             <foreach collection="list" item="company" separator=",">
                 (
                 #{company.name}, #{company.location}, #{company.industry}, #{company.scale},
                 #{company.code}, #{company.description}, #{company.nature},
-                #{company.createBy}, #{company.createTime}, #{company.delFlag}
+                #{company.createBy}, #{company.createTime}, #{company.delFlag},#{company.regionName},
+                #{company.regionCode}
                 )
             </foreach>
         </insert>
@@ -76,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="code != null  and code != ''"> and code = #{code}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="companyId != null  and companyId != ''"> and company_id = #{companyId}</if>
+            <if test="regionCode != null  and regionCode != ''"> and region_code = #{regionCode}</if>
         </where>
     </select>
     <select id="label" resultMap="CompanyResult">

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

@@ -167,4 +167,7 @@ public class AppUser extends BaseEntity
 
     @ApiModelProperty("地纬userid")
     private String dwUserid;
+
+    @ApiModelProperty("所属行政区划")
+    private String regionCode;
 }

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

@@ -124,6 +124,15 @@ public class Company extends BaseEntity
     @ApiModelProperty("法人联系方式")
     private String legalPhone;
 
+    @ApiModelProperty("所属行政区划")
+    private String regionCode;
+
+    @ApiModelProperty("所属行政区划名称")
+    private String regionName;
+
+    @ApiModelProperty("行业code")
+    private String industryCode;
+
     /**
      * 岗位列表
      */