承运优化需求-添加模板

performance-web/src/main/java/com/clx/performance/dao/export/ExportTemplateDao.java

@@ -71,10 +71,9 @@ public interface ExportTemplateDao extends BaseDao<ExportTemplateMapper, ExportT
     /**
      * 去除用户在某个功能下的默认模板
      *
-     * @param userNo       用户编码
      * @param functionCode 功能code
      */
-    void updateTemplateNotDefault(Long userNo, String functionCode);
+    void updateTemplateNotDefault(String functionCode);
 
     /**
      * 设置模板为默认模板

performance-web/src/main/java/com/clx/performance/dao/impl/export/ExportTemplateDaoImpl.java

@@ -6,7 +6,6 @@ import com.clx.performance.model.export.ExportTemplate;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import com.msl.common.enums.WhetherEnum;
-import com.msl.user.utils.TokenUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
@@ -69,11 +68,9 @@ public class ExportTemplateDaoImpl extends BaseDaoImpl<ExportTemplateMapper, Exp
     }
 
     @Override
-    public void updateTemplateNotDefault(Long userNo, String functionCode) {
+    public void updateTemplateNotDefault(String functionCode) {
         update(lUdWrapper().set(ExportTemplate::getDefaultFlag, WhetherEnum.get(false))
-                .eq(ExportTemplate::getUserNo, userNo)
-                .eq(ExportTemplate::getExportFunctionCode, functionCode)
-                .eq(ExportTemplate::getCompanyNo, TokenUtil.getLoginUserInfo().getCompanyNo()));
+                .eq(ExportTemplate::getExportFunctionCode, functionCode));
     }
 
     @Override

performance-web/src/main/java/com/clx/performance/model/export/ExportTemplate.java

@@ -20,14 +20,6 @@ public class ExportTemplate implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @TableField("user_no")
-    @ApiModelProperty("用户编码")
-    private Long userNo;
-
-    @TableField("company_no")
-    @ApiModelProperty("公司编码")
-    private Long companyNo;
-
     @TableField("export_function_code")
     @ApiModelProperty("功能code")
     private String exportFunctionCode;

performance-web/src/main/java/com/clx/performance/model/export/ExportTemplateField.java

@@ -20,14 +20,6 @@ public class ExportTemplateField implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @TableField("user_no")
-    @ApiModelProperty("用户编码")
-    private Long userNo;
-
-    @TableField("company_no")
-    @ApiModelProperty("公司编码")
-    private Long companyNo;
-
     @TableField("export_template_id")
     @ApiModelProperty("导出模板id")
     private Integer exportTemplateId;

performance-web/src/main/java/com/clx/performance/service/impl/export/ExportFieldServiceImpl.java

@@ -207,7 +207,7 @@ public class ExportFieldServiceImpl implements ExportFieldService {
             return;
         }
         //去除用户在模板所属功能下已设置过的默认模板
-        exportTemplateDao.updateTemplateNotDefault(template.getUserNo(), template.getExportFunctionCode());
+        exportTemplateDao.updateTemplateNotDefault(template.getExportFunctionCode());
         //设置当前模板为默认
         exportTemplateDao.updateTemplateDefault(templateId);
     }
@@ -226,8 +226,6 @@ public class ExportFieldServiceImpl implements ExportFieldService {
         List<ExportTemplateField> templateFields = Lists.newArrayList();
         for (int i = 0; i < fieldIds.size(); i++) {
             ExportTemplateField field = new ExportTemplateField();
-            field.setUserNo(user.getUserNo());
-            field.setCompanyNo(user.getCompanyNo());
             field.setExportTemplateId(id);
             field.setExportFieldId(fieldIds.get(i));
             field.setSort(i);
@@ -257,8 +255,6 @@ public class ExportFieldServiceImpl implements ExportFieldService {
         List<ExportTemplateField> templateFields = Lists.newArrayList();
         for (int i = 0; i < fields.size(); i++) {
             ExportTemplateField field = new ExportTemplateField();
-            field.setUserNo(user.getUserNo());
-            field.setCompanyNo(user.getCompanyNo());
             field.setExportTemplateId(id);
             field.setExportFieldId(fields.get(i).getId());
             field.setSort(i);