修改

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -1198,4 +1198,10 @@ public class UniversalController extends BaseRESTfulController {
     public RESTfulResult updateColumnShowHidden(@RequestBody Map<String,Object> map){
         return success(universalService.updateColumnShowHidden(map));
     }
+
+    @ApiOperation("查询列的显示隐藏方案")
+    @PostMapping("getColumShowHideScheme")
+    public RESTfulResult getColumShowHideScheme(@RequestBody Map<String,Object> map) {
+        return success(universalService.getColumShowHideScheme(map));
+    }
 }

src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -140,7 +140,7 @@ public interface TmsTruckFeign {
             @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
     })
     @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/enFactoryResultByPDA")
-    public Map<String, Object> enFactoryResultByPDA(@RequestBody(required=false) Map<String,Object> mapValue);
+    Map<String, Object> enFactoryResultByPDA(@RequestBody(required=false) Map<String,Object> mapValue);
 
 
     /*

src/main/java/com/steerinfo/dil/mapper/DilRoleOrgcodeTableMapper.java

@@ -6,10 +6,16 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
+import java.util.Map;
 
 @Mapper
 public interface DilRoleOrgcodeTableMapper extends IBaseMapper<DilRoleOrgcodeTable, BigDecimal> {
 
     @Select("select seq__dilTableColumn.nextval from dual")
     BigDecimal getPrimaryId();
+
+    int updateEnableStatus(Map<String, Object> map);
+
+    int deleteSchmenLColumnData(Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -293,4 +293,6 @@ public interface UniversalMapper {
 
     int updateRemark(Map<String, Object> map);
 
+    List<Map<String, Object>> getColumnAllScheme(Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/model/DilRoleOrgcodeTable.java

@@ -3,7 +3,6 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 
 @ApiModel(value="机构与列的展示关系")
@@ -32,6 +31,18 @@ public class DilRoleOrgcodeTable implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="列ID",required=false)
     private BigDecimal columnId;
 
+    /**
+     * 方案名称(PRIMARY_NAME,VARCHAR,200)
+     */
+    @ApiModelProperty(value="方案名称",required=false)
+    private String primaryName;
+
+    /**
+     * 启用状态,0 未启用；1，启用(ENABLE_STATUS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="启用状态,0 未启用；1，启用",required=false)
+    private BigDecimal enableStatus;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -76,6 +87,22 @@ public class DilRoleOrgcodeTable implements IBasePO<BigDecimal> {
         this.columnId = columnId;
     }
 
+    public String getPrimaryName() {
+        return primaryName;
+    }
+
+    public void setPrimaryName(String primaryName) {
+        this.primaryName = primaryName == null ? null : primaryName.trim();
+    }
+
+    public BigDecimal getEnableStatus() {
+        return enableStatus;
+    }
+
+    public void setEnableStatus(BigDecimal enableStatus) {
+        this.enableStatus = enableStatus;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -86,6 +113,8 @@ public class DilRoleOrgcodeTable implements IBasePO<BigDecimal> {
         sb.append(", orgCode=").append(orgCode);
         sb.append(", userName=").append(userName);
         sb.append(", columnId=").append(columnId);
+        sb.append(", primaryName=").append(primaryName);
+        sb.append(", enableStatus=").append(enableStatus);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/UniversalService.java

@@ -30,4 +30,6 @@ public interface UniversalService {
     Map<String, Object> getColumnShowHidden(Map<String, Object> map);
 
     int updateColumnShowHidden(Map<String, Object> map);
+
+    Map<String,Object> getColumShowHideScheme(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -12,6 +12,7 @@ import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.ESUtil;
 import com.steerinfo.dil.util.HTTPRequestUtils;
 import com.steerinfo.framework.controller.RESTfulResult;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -433,10 +434,14 @@ public class UniversalServiceImpl implements UniversalService {
     }
 
     @Override
-    public int updateColumnShowHidden(Map<String, Object> map) {
+    public synchronized int updateColumnShowHidden(Map<String, Object> map) {
         int i = 0 ;
         //首先删除原来的列
-        i += dilRoleOrgcodeTableMapper.deleteBySelectiveElement(map);
+        if("默认方案".equals(map.get("schemeName"))) {
+            dilRoleOrgcodeTableMapper.updateEnableStatus(map);
+            return 0;
+        }
+        i += dilRoleOrgcodeTableMapper.deleteSchmenLColumnData(map);
         List<String> columnHiddenData = (List<String>) map.get("columnHiddenData");
         List<DilRoleOrgcodeTable> mapList = new ArrayList<>();
         for (String s : columnHiddenData) {
@@ -445,13 +450,59 @@ public class UniversalServiceImpl implements UniversalService {
             dilRoleOrgcodeTable.setColumnId(columnId);
             dilRoleOrgcodeTable.setUserName(map.get("userName").toString());
             dilRoleOrgcodeTable.setOrgCode(map.get("orgCode").toString());
+            dilRoleOrgcodeTable.setEnableStatus(new BigDecimal(1));
+            dilRoleOrgcodeTable.setPrimaryName(map.get("schemeName").toString());
             dilRoleOrgcodeTable.setPrimaryId(dilRoleOrgcodeTableMapper.getPrimaryId());
             mapList.add(dilRoleOrgcodeTable);
         }
+        //将该用户的所有方案都变成未启用状
         if(mapList.size() > 0) {
             //然后再批量新增进去
             i += dilRoleOrgcodeTableMapper.batchInsert(mapList);
         }
         return i;
     }
+
+    @Override
+    public Map<String,Object> getColumShowHideScheme(Map<String, Object> map) {
+        Map<String, Object> responseMap = new HashMap<>();
+        List<Map<String,Object>> schemeList = new ArrayList<>();
+        //每一个map;
+        Map<String,Object> schemeMap = new HashMap<>();
+        //作为传值用的map
+        Map<String,Object> attrMap = new HashMap<>();
+        //当前启用状态的值
+        String activeName = "默认方案";
+        //以下是方案的标题和名字
+        schemeMap.put("title","默认方案");
+        schemeMap.put("name","默认方案");
+        //以下是方案的显示数据和隐藏数据
+        List<Map<String,Object>> columnAllData = universalMapper.getColumnAllData(map);
+        schemeMap.put("columnAllData",columnAllData);
+        responseMap.put("columnAllData",columnAllData);
+        attrMap.put("tableName",map.get("tableName"));
+        map.put("schemeName",activeName);
+        List<String> columnHiddenData = universalMapper.getColumnHiddenData(map);
+        schemeMap.put("columnHiddenData",columnHiddenData);
+        schemeList.add(schemeMap);
+        responseMap.put("activeName",activeName);
+        responseMap.put("columnHiddenData",columnHiddenData);
+        //然后根据用户名和报表名称,去查询方案名称和启用状态
+        List<Map<String,Object>> schemeMapAnotherData = universalMapper.getColumnAllScheme(map);
+        for(Map<String,Object> schemeMapAnotherDataMap : schemeMapAnotherData) {
+                Map<String, Object> itemMap = new HashMap<>();
+                itemMap.put("title",schemeMapAnotherDataMap.get("schemeName"));
+                itemMap.put("name",schemeMapAnotherDataMap.get("schemeName"));
+                itemMap.put("columnAllData",columnAllData);
+                List<String> itemColumnHiddenData = universalMapper.getColumnHiddenData(schemeMapAnotherDataMap);
+                itemMap.put("columnHiddenData",itemColumnHiddenData);
+                schemeList.add(itemMap);
+                if(DataChange.dataToBigDecimal(schemeMapAnotherDataMap.get("enableStatus")).compareTo(new BigDecimal(1)) == 0){
+                    responseMap.put("activeName",schemeMapAnotherDataMap.get("schemeName"));
+                    responseMap.put("columnHiddenData",itemColumnHiddenData);
+                }
+        }
+        responseMap.put("schemeList",schemeList);
+        return responseMap;
+    }
 }

src/main/resources/com/steerinfo/dil/mapper/DilRoleOrgcodeTableMapper.xml

@@ -6,12 +6,14 @@
     <result column="ORG_CODE" jdbcType="VARCHAR" property="orgCode" />
     <result column="USER_NAME" jdbcType="VARCHAR" property="userName" />
     <result column="COLUMN_ID" jdbcType="DECIMAL" property="columnId" />
+    <result column="PRIMARY_NAME" jdbcType="VARCHAR" property="primaryName" />
+    <result column="ENABLE_STATUS" jdbcType="DECIMAL" property="enableStatus" />
   </resultMap>
   <sql id="columns">
-    PRIMARY_ID, ORG_CODE, USER_NAME, COLUMN_ID
+    PRIMARY_ID, ORG_CODE, USER_NAME, COLUMN_ID, PRIMARY_NAME, ENABLE_STATUS
   </sql>
   <sql id="columns_alias">
-    t.PRIMARY_ID, t.ORG_CODE, t.USER_NAME, t.COLUMN_ID
+    t.PRIMARY_ID, t.ORG_CODE, t.USER_NAME, t.COLUMN_ID, t.PRIMARY_NAME, t.ENABLE_STATUS
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM DIL_ROLE_ORGCODE_TABLE
@@ -20,7 +22,7 @@
     SELECT <include refid="columns_alias"/> FROM DIL_ROLE_ORGCODE_TABLE t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="primaryId != null">
         and PRIMARY_ID = #{primaryId}
       </if>
@@ -33,10 +35,16 @@
       <if test="columnId != null">
         and COLUMN_ID = #{columnId}
       </if>
+      <if test="primaryName != null and primaryName != ''">
+        and PRIMARY_NAME = #{primaryName}
+      </if>
+      <if test="enableStatus != null">
+        and ENABLE_STATUS = #{enableStatus}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="primaryId != null">
         and PRIMARY_ID = #{primaryId}
       </if>
@@ -49,6 +57,12 @@
       <if test="columnId != null">
         and COLUMN_ID = #{columnId}
       </if>
+      <if test="primaryName != null and primaryName != ''">
+        and PRIMARY_NAME LIKE '%${primaryName}%'
+      </if>
+      <if test="enableStatus != null">
+        and ENABLE_STATUS = #{enableStatus}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -57,22 +71,30 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from DIL_ROLE_ORGCODE_TABLE
-    where 1!=1 
-      <if test="orgCode != null and orgCode != ''">
-        or ORG_CODE = #{orgCode}
-      </if>
-      <if test="userName != null and userName != ''">
-        or USER_NAME = #{userName}
-      </if>
-      <if test="columnId != null">
-        or COLUMN_ID = #{columnId}
-      </if>
+    where 1!=1
+    <if test="orgCode != null and orgCode != ''">
+      or ORG_CODE = #{orgCode}
+    </if>
+    <if test="userName != null and userName != ''">
+      or USER_NAME = #{userName}
+    </if>
+    <if test="columnId != null">
+      or COLUMN_ID = #{columnId}
+    </if>
+    <if test="primaryName != null and primaryName != ''">
+      or PRIMARY_NAME = #{primaryName}
+    </if>
+    <if test="enableStatus != null">
+      or ENABLE_STATUS = #{enableStatus}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
-    insert into DIL_ROLE_ORGCODE_TABLE (PRIMARY_ID, ORG_CODE, USER_NAME, 
-      COLUMN_ID)
-    values (#{primaryId,jdbcType=DECIMAL}, #{orgCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 
-      #{columnId,jdbcType=DECIMAL})
+    insert into DIL_ROLE_ORGCODE_TABLE (PRIMARY_ID, ORG_CODE, USER_NAME,
+                                        COLUMN_ID, PRIMARY_NAME, ENABLE_STATUS
+    )
+    values (#{primaryId,jdbcType=DECIMAL}, #{orgCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR},
+            #{columnId,jdbcType=DECIMAL}, #{primaryName,jdbcType=VARCHAR}, #{enableStatus,jdbcType=DECIMAL}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
     insert into DIL_ROLE_ORGCODE_TABLE
@@ -89,6 +111,12 @@
       <if test="columnId != null">
         COLUMN_ID,
       </if>
+      <if test="primaryName != null">
+        PRIMARY_NAME,
+      </if>
+      <if test="enableStatus != null">
+        ENABLE_STATUS,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="primaryId != null">
@@ -103,13 +131,21 @@
       <if test="columnId != null">
         #{columnId,jdbcType=DECIMAL},
       </if>
+      <if test="primaryName != null">
+        #{primaryName,jdbcType=VARCHAR},
+      </if>
+      <if test="enableStatus != null">
+        #{enableStatus,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
     update DIL_ROLE_ORGCODE_TABLE
     set ORG_CODE = #{orgCode,jdbcType=VARCHAR},
-      USER_NAME = #{userName,jdbcType=VARCHAR},
-      COLUMN_ID = #{columnId,jdbcType=DECIMAL}
+        USER_NAME = #{userName,jdbcType=VARCHAR},
+        COLUMN_ID = #{columnId,jdbcType=DECIMAL},
+        PRIMARY_NAME = #{primaryName,jdbcType=VARCHAR},
+        ENABLE_STATUS = #{enableStatus,jdbcType=DECIMAL}
     where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
@@ -124,6 +160,12 @@
       <if test="columnId != null">
         COLUMN_ID = #{columnId,jdbcType=DECIMAL},
       </if>
+      <if test="primaryName != null">
+        PRIMARY_NAME = #{primaryName,jdbcType=VARCHAR},
+      </if>
+      <if test="enableStatus != null">
+        ENABLE_STATUS = #{enableStatus,jdbcType=DECIMAL},
+      </if>
     </set>
     where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
   </update>
@@ -140,49 +182,76 @@
     <include refid="whereLike"/>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into DIL_ROLE_ORGCODE_TABLE 
-      (PRIMARY_ID, 
-      ORG_CODE, USER_NAME, COLUMN_ID
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.primaryId,jdbcType=DECIMAL}, 
-      #{item.orgCode,jdbcType=VARCHAR}, #{item.userName,jdbcType=VARCHAR}, #{item.columnId,jdbcType=DECIMAL}
-       from dual  
-   </foreach> )
+    insert into DIL_ROLE_ORGCODE_TABLE
+    (PRIMARY_ID,
+    ORG_CODE, USER_NAME, COLUMN_ID,
+    PRIMARY_NAME, ENABLE_STATUS)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.primaryId,jdbcType=DECIMAL},
+    #{item.orgCode,jdbcType=VARCHAR}, #{item.userName,jdbcType=VARCHAR}, #{item.columnId,jdbcType=DECIMAL},
+    #{item.primaryName,jdbcType=VARCHAR}, #{item.enableStatus,jdbcType=DECIMAL} from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update DIL_ROLE_ORGCODE_TABLE
-     set
-       PRIMARY_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryId,jdbcType=DECIMAL}
-       </foreach>
-       ,ORG_CODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.orgCode,jdbcType=VARCHAR}
-       </foreach>
-       ,USER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.userName,jdbcType=VARCHAR}
-       </foreach>
-       ,COLUMN_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.columnId,jdbcType=DECIMAL}
-       </foreach>
-     where PRIMARY_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.primaryId,jdbcType=DECIMAL}
-     </foreach> 
+    update DIL_ROLE_ORGCODE_TABLE
+    set
+    PRIMARY_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+      when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryId,jdbcType=DECIMAL}
+    </foreach>
+    ,ORG_CODE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+      when #{item.primaryId,jdbcType=DECIMAL} then #{item.orgCode,jdbcType=VARCHAR}
+    </foreach>
+    ,USER_NAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+      when #{item.primaryId,jdbcType=DECIMAL} then #{item.userName,jdbcType=VARCHAR}
+    </foreach>
+    ,COLUMN_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+      when #{item.primaryId,jdbcType=DECIMAL} then #{item.columnId,jdbcType=DECIMAL}
+    </foreach>
+    ,PRIMARY_NAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+      when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryName,jdbcType=VARCHAR}
+    </foreach>
+    ,ENABLE_STATUS=
+    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+      when #{item.primaryId,jdbcType=DECIMAL} then #{item.enableStatus,jdbcType=DECIMAL}
+    </foreach>
+    where PRIMARY_ID in
+    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+      #{item.primaryId,jdbcType=DECIMAL}
+    </foreach>
   </update>
+
   <delete id="batchDelete" parameterType="java.util.List">
     delete from DIL_ROLE_ORGCODE_TABLE
-    where PRIMARY_ID in 
+    where PRIMARY_ID in
     <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
   </delete>
+
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+  <delete id="deleteSchmenLColumnData" parameterType="map">
+    delete from DIL_ROLE_ORGCODE_TABLE DROT
+    where DROT.USER_NAME = #{userName}
+    and DROT.ORG_CODE = #{orgCode}
+    and DROT.PRIMARY_NAME = #{schemeName}
+    AND DROT.COLUMN_ID IN (SELECT DTCR.PRIMARY_ID FROM DIL_TABLE_COLUMN_ROLE DTCR
+    WHERE DTCR.TABLE_NAME = #{tableName})
+  </delete>
+  <update id="updateEnableStatus" parameterType="map">
+    UPDATE DIL_ROLE_ORGCODE_TABLE DROT
+    SET DROT.ENABLE_STATUS = 0
+    where
+    DROT.USER_NAME = #{userName}
+    AND DROT.COLUMN_ID IN
+    (SELECT DTCR.PRIMARY_ID FROM DIL_TABLE_COLUMN_ROLE DTCR
+    WHERE DTCR.TABLE_NAME = #{tableName})
+    AND DROT.ORG_CODE = #{orgCode}
+  </update>
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1588,10 +1588,13 @@
         <if test="userName != null">
             AND nvl(DROT.USER_NAME,'0') != #{userName}
         </if>
+        <if test="schemeName != null">
+            AND nvl(DROT.PRIMARY_NAME,'0') != #{schemeName}
+        </if>
     </select>
     <select id="getColumnHiddenData" resultType="string" parameterType="map">
-        SELECT DTCR.COLUMN_NAME FROM DIL_TABLE_COLUMN_ROLE DTCR
-        LEFT JOIN DIL_ROLE_ORGCODE_TABLE DROT on DTCR.PRIMARY_ID = DROT.COLUMN_ID
+        SELECT DTCR.COLUMN_NAME FROM DIL_ROLE_ORGCODE_TABLE DROT
+        LEFT JOIN DIL_TABLE_COLUMN_ROLE DTCR on DTCR.PRIMARY_ID = DROT.COLUMN_ID
         WHERE
         DTCR.TABLE_NAME = #{tableName}
         <if test="userName != null">
@@ -1600,6 +1603,9 @@
         <if test="orgCode != null">
             AND DROT.ORG_CODE = #{orgCode}
         </if>
+        <if test="schemeName != null">
+            AND nvl(DROT.PRIMARY_NAME,'0') = #{schemeName}
+        </if>
     </select>
     <select id="getColumnAllData" resultType="java.util.Map" parameterType="map">
         SELECT DTCR.COLUMN_NAME "key",
@@ -1608,10 +1614,25 @@
         WHERE
             DTCR.TABLE_NAME = #{tableName}
     </select>
+
     <update id="updateRemark">
         UPDATE OMSTRUCK_ORDER
         SET REMARK = #{remark}
         WHERE ORDER_ID = #{orderId}
     </update>
-
+    <select id="getColumnAllScheme" resultType="java.util.LinkedHashMap" parameterType="map">
+      SELECT
+            distinct
+             DROT.PRIMARY_NAME "schemeName",
+             DROT.ENABLE_STATUS "enableStatus" ,
+             DROT.USER_NAME "userName",
+             DROT.ORG_CODE  "orgCode",
+             DTCR.TABLE_NAME "tableName"
+      FROM DIL_ROLE_ORGCODE_TABLE DROT
+      LEFT JOIN DIL_TABLE_COLUMN_ROLE DTCR on DROT.COLUMN_ID = DTCR.PRIMARY_ID
+      WHERE DROT.USER_NAME = #{userName}
+      AND DROT.ORG_CODE = #{orgCode}
+      AND DTCR.TABLE_NAME = #{tableName}
+      AND NVL(DROT.PRIMARY_NAME,'') != '默认方案'
+    </select>
 </mapper>

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout