Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-api/src/main/java/com/gic/store/dto/ClerkStoreListDTO.java

@@ -23,6 +23,7 @@ public class ClerkStoreListDTO implements Serializable {
     private String storeName;
     private String storeCode;
     private List<ClerkDTO> clerkList;
+    private Integer ownType;
 
 
     public Integer getStoreId() {
@@ -64,4 +65,12 @@ public class ClerkStoreListDTO implements Serializable {
     public void setClerkList(List<ClerkDTO> clerkList) {
         this.clerkList = clerkList;
     }
+
+    public void setOwnType(Integer ownType) {
+        this.ownType = ownType;
+    }
+
+    public Integer getOwnType() {
+        return ownType;
+    }
 }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java

@@ -92,6 +92,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             clerkStoreListDTO.setStoreInfoId(store.getStoreInfoId());
             clerkStoreListDTO.setStoreName(store.getStoreName());
             clerkStoreListDTO.setStoreCode(store.getStoreCode());
+            clerkStoreListDTO.setOwnType(store.getOwnType());
             storeClerkDTOList.add(clerkStoreListDTO);
             storeInfoIds.add(store.getStoreInfoId());
         }
@@ -134,7 +135,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         storeSearchDTO.setSearchJson(clerkSearchDTO.getSelectJson());
         storeSearchDTO.setStoreIds(clerkSearchDTO.getStoreIds());
 
-        return this.storeApiService.listStore(storeSearchDTO, pageNum, pageSize, "storeId,storeName,storeCode,storeInfoId");
+        return this.storeApiService.listStore(storeSearchDTO, pageNum, pageSize);
     }
 
     @Override

gic-store-service/src/main/resources/mapper/TabStoreInfoMapper.xml

@@ -25,6 +25,9 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="index_id" jdbcType="BIGINT" property="indexId"/>
   </resultMap>
+  <resultMap id="DTOResultMap" type="com.gic.store.dto.StoreDTO" extends="BaseResultMap">
+    <result column="own_type" jdbcType="INTEGER" property="ownType" />
+  </resultMap>
   <sql id="Base_Column_List">
     ${alias}.store_info_id, ${alias}.store_name, ${alias}.store_code, ${alias}.region_id, ${alias}.conacts_phone, ${alias}.address,
     ${alias}.brand_ids, ${alias}.province_id, ${alias}.city_id, ${alias}.area_id, ${alias}.provinces, ${alias}.longitude, ${alias}.latitude, ${alias}.overflow_status,
@@ -439,7 +442,7 @@
       #{storeInfoId}
     </foreach>
   </update>
-  <select id="getByStoreNameAndStoreCode" resultType="com.gic.store.dto.StoreDTO">
+  <select id="getByStoreNameAndStoreCode" resultMap="DTOResultMap">
     select
     <include refid="Base_Column_List">
       <property name="alias" value="t1"/>

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkImportController.java

@@ -285,13 +285,17 @@ public class ClerkImportController {
             }
         }
         // 验证门店是否存在
+        StoreDTO storeDTO = storeApiService.getByStoreNameAndStoreCode(enterpriseId, storeName, storeCode).getResult();
         if (validate) {
-            StoreDTO storeDTO = storeApiService.getByStoreNameAndStoreCode(enterpriseId, storeName, storeCode).getResult();
             if (storeDTO == null) {
                 bean.setErrorMessage("门店不存在");
+                validate = false;
             }
+        }
+        if (validate) {
             if (StoreOwnTypeEnum.OWNER.getCode() != storeDTO.getOwnType()) {
                 bean.setErrorMessage("不能在被授权门店下导入导购");
+                validate = false;
             }
         }
         // 验证岗位