Merge branch 'feature-haoban-role' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/role/HaobanMenuQDTO.java

@@ -46,6 +46,7 @@ public class HaobanMenuQDTO implements Serializable {
     private String parentCode;
 
     private String routePath;
+    private String ownerShip;
 
     public String getMenuCode() {
         return menuCode;
@@ -119,5 +120,13 @@ public class HaobanMenuQDTO implements Serializable {
     public void setRoutePath(String routePath) {
         this.routePath = routePath;
     }
+
+    public String getOwnerShip() {
+        return ownerShip;
+    }
+
+    public void setOwnerShip(String ownerShip) {
+        this.ownerShip = ownerShip;
+    }
 }
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/role/HaobanMenuDTO.java

@@ -56,6 +56,7 @@ public class HaobanMenuDTO implements Serializable {
     private Date updateTime;
 
     private String routePath;
+    private String ownerShip;
 
     private List<HaobanMenuDTO> menuBOList;
 
@@ -162,5 +163,13 @@ public class HaobanMenuDTO implements Serializable {
     public void setRoutePath(String routePath) {
         this.routePath = routePath;
     }
+
+    public String getOwnerShip() {
+        return ownerShip;
+    }
+
+    public void setOwnerShip(String ownerShip) {
+        this.ownerShip = ownerShip;
+    }
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/role/TabHaobanMenu.java

@@ -48,6 +48,8 @@ public class TabHaobanMenu implements Serializable {
      */
     private Integer statusFlag;
 
+    private String ownerShip;
+
     private Date createTime;
 
     private Date updateTime;
@@ -139,5 +141,13 @@ public class TabHaobanMenu implements Serializable {
     public void setRoutePath(String routePath) {
         this.routePath = routePath;
     }
+
+    public String getOwnerShip() {
+        return ownerShip;
+    }
+
+    public void setOwnerShip(String ownerShip) {
+        this.ownerShip = ownerShip;
+    }
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/role/HaobanMenuBO.java

@@ -53,6 +53,8 @@ public class HaobanMenuBO implements Serializable {
      */
     private Integer statusFlag;
 
+    private String ownerShip;
+
     private Date createTime;
 
     private Date updateTime;
@@ -162,5 +164,13 @@ public class HaobanMenuBO implements Serializable {
     public void setRoutePath(String routePath) {
         this.routePath = routePath;
     }
+
+    public String getOwnerShip() {
+        return ownerShip;
+    }
+
+    public void setOwnerShip(String ownerShip) {
+        this.ownerShip = ownerShip;
+    }
 }
 

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -570,10 +570,12 @@
         <include refid="Base_Column_List"/>
         from tab_haoban_staff_clerk_relation
         where status_flag=1
-        and store_id in
-        <foreach collection="storeIds" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        <if test="null != storeIds and storeIds.size gt 0">
+            and store_id in
+            <foreach collection="storeIds" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>>
     </select>
 
 </mapper>
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/role/TabHaobanMenuMapper.xml

@@ -11,14 +11,16 @@
         <result property="menuSort" column="menu_sort" jdbcType="INTEGER"/>
         <result property="parentCode" column="parent_code" jdbcType="VARCHAR"/>
         <result property="routePath" column="route_path" jdbcType="VARCHAR"/>
+        <result property="ownerShip" column="owner_ship" jdbcType="VARCHAR"/>
         <result property="statusFlag" column="status_flag" jdbcType="INTEGER"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-    menu_code, menu_name, menu_url, icon_url, menu_type, menu_sort, parent_code, status_flag,route_path, create_time, update_time
-  </sql>
+        menu_code
+        , menu_name, menu_url, icon_url, menu_type, menu_sort, parent_code, status_flag,route_path,owner_ship, create_time, update_time
+    </sql>
 
     <!--查询单个-->
     <select id="queryById" resultMap="TabHaobanMenuMap">
@@ -30,18 +32,20 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="menuId" useGeneratedKeys="true">
-        insert into tab_haoban_menu(menu_code, menu_name, menu_url, icon_url,  menu_type, menu_sort, parent_code, status_flag,route_path, create_time, update_time)
-        values (#{menuCode}, #{menuName}, #{menuUrl}, #{iconUrl},  #{menuType}, #{menuSort}, #{parentCode}, #{statusFlag},#{routePath}, #{createTime}, #{updateTime})
+        insert into tab_haoban_menu(menu_code, menu_name, menu_url, icon_url, menu_type, menu_sort, parent_code,
+                                    status_flag, route_path, owner_ship, create_time, update_time)
+        values (#{menuCode}, #{menuName}, #{menuUrl}, #{iconUrl}, #{menuType}, #{menuSort}, #{parentCode},
+                #{statusFlag}, #{routePath}, #{ownerShip}, #{createTime}, #{updateTime})
     </insert>
 
     <insert id="insertBatch" keyProperty="menuId" useGeneratedKeys="true">
         insert into tab_haoban_menu(menu_code, menu_name, menu_url, icon_url, menu_type,
-        menu_sort, parent_code, status_flag,route_path, create_time, update_time)
+        menu_sort, parent_code, status_flag,route_path,owner_ship, create_time, update_time)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.menuCode}, #{entity.menuName}, #{entity.menuUrl}, #{entity.iconUrl},
             #{entity.menuType}, #{entity.menuSort}, #{entity.parentCode},
-            #{entity.statusFlag},#{entity.routePath},
+            #{entity.statusFlag},#{entity.routePath},#{entity.ownerShip},
             #{entity.createTime}, #{entity.updateTime})
         </foreach>
     </insert>
@@ -75,6 +79,9 @@
             <if test="routePath != null">
                 route_path = #{routePath},
             </if>
+            <if test="ownerShip != null">
+                owner_ship = #{ownerShip},
+            </if>
             <if test="createTime != null">
                 create_time = #{createTime},
             </if>
@@ -87,10 +94,10 @@
 
 
     <select id="getAllMenuList" resultType="java.lang.String">
-        select
-        menu_code
+        select menu_code
         from tab_haoban_menu
-        where status_flag = 1 order by menu_sort
+        where status_flag = 1
+        order by menu_sort
     </select>
 
     <select id="getPidMenuList" resultMap="TabHaobanMenuMap">
@@ -177,7 +184,8 @@
         <foreach collection="menuCodes" open="(" close=")" separator="," item="item">
             #{item}
         </foreach>
-        and menu_code not in ('customerList_allSearch','customerList_allSearch','userCenter_addClerk','userCenter_delClerk','storeClerkList_edit');
+        and menu_code not in
+        ('customerList_allSearch','customerList_allSearch','userCenter_addClerk','userCenter_delClerk','storeClerkList_edit');
     </select>
 
     <select id="getHaobanMenuListByCode" resultMap="TabHaobanMenuMap">
@@ -199,7 +207,8 @@
     </select>
 
     <delete id="deleteAll">
-       delete from tab_haoban_menu
+        delete
+        from tab_haoban_menu
     </delete>
 
 </mapper>

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java

@@ -146,7 +146,7 @@ public class ClerkController extends WebBaseController {
 
     //门店成员列表
     @RequestMapping("/store-clerks")
-    public HaobanResponse storeClerks(String clerkId, String enterpriseId, String storeId, Integer manageFlag) {
+    public HaobanResponse storeClerks(BasePageInfo basePageInfo,String clerkId, String enterpriseId, String storeId, Integer manageFlag) {
         WellDoneLoginDTO loginUser = this.getLoginUser();
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         List<String> storeIds = new ArrayList<>();
@@ -163,6 +163,7 @@ public class ClerkController extends WebBaseController {
             storeIds = null;
         }
         List<ClerkDTO> clerkDTOS = clerkService.listClerkByNameOrCode(enterpriseId, null, storeIds);
+
         Set<String> clerkCodeList = clerkDTOS.stream().map(ClerkDTO::getClerkCode).collect(Collectors.toSet());
         List<StaffClerkRelationDTO> bindRelationList = staffClerkRelationApiService.listBindCode(enterpriseId, clerkCodeList);
         Map<String, StaffClerkRelationDTO> bindCodeMap = bindRelationList.stream().collect(Collectors.toMap(StaffClerkRelationDTO::getClerkCode, s -> s));
@@ -685,7 +686,7 @@ public class ClerkController extends WebBaseController {
         } else {
             clerkList.addAll(clerkNewService.listClerkByEnterpriseIdAndSearchAndClerkType(enterpriseIdList, storeIds, keyword));
         }
-        List<ClerkStoreVO> clerkStoreList = buildClerkRelation(clerkList, enterpriseIdList);
+        List<ClerkStoreVO> clerkStoreList = buildClerkRelation(clerkList, enterpriseIdList, wxEnterpriseId);
         return resultResponse(HaoBanErrCode.ERR_1, clerkStoreList);
     }
 
@@ -713,7 +714,7 @@ public class ClerkController extends WebBaseController {
         }).map(s -> s.getEnterpriseId()).collect(Collectors.toList());
         List<String> storeIds = wxEnterpriseRelatedApiService.listStoreIdByWxEnterpriseId(wxEnterpriseId);
         List<ClerkDTO> clerkList = this.getUnbindClerkList(enterpriseIdList, storeIds, staffId);
-        List<ClerkStoreVO> clerkStoreList = buildClerkRelation(clerkList, enterpriseIdList);
+        List<ClerkStoreVO> clerkStoreList = buildClerkRelation(clerkList, enterpriseIdList, wxEnterpriseId);
         return resultResponse(HaoBanErrCode.ERR_1, clerkStoreList);
     }
 
@@ -724,7 +725,7 @@ public class ClerkController extends WebBaseController {
      * @param enterpriseIdList
      * @return
      */
-    private List<ClerkStoreVO> buildClerkRelation(List<ClerkDTO> clerkList, List<String> enterpriseIdList) {
+    private List<ClerkStoreVO> buildClerkRelation(List<ClerkDTO> clerkList, List<String> enterpriseIdList, String wxEnterpriseId) {
         List<ClerkStoreVO> clerkStoreList = new ArrayList<>();
         if (CollectionUtil.isEmpty(clerkList)) {
             return clerkStoreList;
@@ -738,13 +739,14 @@ public class ClerkController extends WebBaseController {
         for (ClerkDTO clerk : clerkList) {
             String enterpriseId = clerk.getEnterpriseId();
             EnterpriseDTO enterpriseDTO = map.get(enterpriseId);
-            StaffClerkRelationDTO staffClerkRelationDTO = clerkBindMap.get(clerk.getClerkId());
-
+            String clerkId = clerk.getClerkId();
+            StaffClerkRelationDTO staffClerkRelationDTO = clerkBindMap.get(clerkId);
+            Integer clerkType = clerk.getClerkType();
             ClerkStoreVO vo = new ClerkStoreVO();
-            vo.setClerkId(clerk.getClerkId());
+            vo.setClerkId(clerkId);
             vo.setClerkCode(clerk.getClerkCode());
             vo.setClerkName(clerk.getClerkName());
-            vo.setClerkType(clerk.getClerkType());
+            vo.setClerkType(clerkType);
             vo.setEnterpriseName(enterpriseDTO == null ? "" : enterpriseDTO.getEnterpriseName());
             vo.setHeadImg(clerk.getHeadImgUrl());
             vo.setPhoneNumber(clerk.getPhoneNumber());
@@ -755,6 +757,14 @@ public class ClerkController extends WebBaseController {
             vo.setBindFlag(staffClerkRelationDTO == null ? 0 : 1);
             vo.setStaffId(staffClerkRelationDTO == null ? "" : staffClerkRelationDTO.getStaffId());
             vo.setStoreId(clerk.getStoreId());
+            //区经
+            if (clerkType == 2) {
+                vo.setManageFlag(1);
+                vo.setManageStoreCount(staffApiService.getCountHaoBanStoreIdsByClerkId(clerkId, wxEnterpriseId).getStoreCount());
+            } else {
+                vo.setManageFlag(0);
+                vo.setManageStoreCount(0);
+            }
             clerkStoreList.add(vo);
         }
         if (CollectionUtil.isNotEmpty(clerkStoreList)) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/ClerkStoreVO.java

@@ -32,6 +32,11 @@ public class ClerkStoreVO implements Serializable{
 
 	private Integer bindFlag;
 
+	private Integer manageFlag;
+
+	private Integer manageStoreCount;
+
+
 	public String getStoreId() {
 		return storeId;
 	}
@@ -144,6 +149,20 @@ public class ClerkStoreVO implements Serializable{
 	public void setHeadImg(String headImg) {
 		this.headImg = headImg;
 	}
-	
-	
+
+	public Integer getManageFlag() {
+		return manageFlag;
+	}
+
+	public void setManageFlag(Integer manageFlag) {
+		this.manageFlag = manageFlag;
+	}
+
+	public Integer getManageStoreCount() {
+		return manageStoreCount;
+	}
+
+	public void setManageStoreCount(Integer manageStoreCount) {
+		this.manageStoreCount = manageStoreCount;
+	}
 }