Revert "增加了关联的企业id"

This reverts commit e1e0cb8d7e0fecae262704f6e711aadeffef9880.

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCompanyTemplate.java

@@ -24,9 +24,6 @@ public class SysCompanyTemplate extends BaseEntity
     /** 企业模板配置 */
     private String template;
 
-    /** 企业ID */
-    private Long companyId;
-
     public void setId(Long id) 
     {
         this.id = id;
@@ -57,23 +54,12 @@ public class SysCompanyTemplate extends BaseEntity
         return template;
     }
 
-    public void setCompanyId(Long companyId)
-    {
-        this.companyId = companyId;
-    }
-
-    public Long getCompanyId()
-    {
-        return companyId;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("companyName", getCompanyName())
             .append("template", getTemplate())
-            .append("companyId", getCompanyId())
             .toString();
     }
 }

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

@@ -8,11 +8,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="companyName"    column="company_name"    />
         <result property="template"    column="template"    />
-        <result property="companyId"    column="company_id"    />
     </resultMap>
 
     <sql id="selectSysCompanyTemplateVo">
-        select id, company_name, template, company_id from sys_company_template
+        select id, company_name, template from sys_company_template
     </sql>
 
     <select id="selectSysCompanyTemplateList" parameterType="SysCompanyTemplate" resultMap="SysCompanyTemplateResult">
@@ -20,7 +19,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
             <if test="template != null  and template != ''"> and template = #{template}</if>
-            <if test="companyId != null"> and company_id = #{companyId}</if>
         </where>
     </select>
     
@@ -34,12 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="companyName != null and companyName != ''">company_name,</if>
             <if test="template != null">template,</if>
-            <if test="companyId != null">company_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyName != null and companyName != ''">#{companyName},</if>
             <if test="template != null">#{template},</if>
-            <if test="companyId != null">#{companyId},</if>
          </trim>
     </insert>
 
@@ -48,7 +44,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="companyName != null and companyName != ''">company_name = #{companyName},</if>
             <if test="template != null">template = #{template},</if>
-            <if test="companyId != null">company_id = #{companyId},</if>
         </trim>
         where id = #{id}
     </update>