商品添加所属部门

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.dto.form.PointRuleFormDTO;
@@ -41,5 +42,16 @@ public interface AdminFeignClient {
     @GetMapping("/sys/dept/getDeptInfoByDeptIdList/{deptId}")
     Result<List<Long>> getDeptInfoByDeptIdList(@PathVariable("deptId") String deptId);
 
+    /**
+     * 根据部门ID获取上级所有部门信息
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<ParentAndAllDeptDTO>
+     * @author wgf
+     * @date 2019-11-29
+     */
+    @GetMapping("/sys/dept/getParentAndAllDept/{deptId}")
+    Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") String deptId);
+
 
 }

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.feign.fallback;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.SysSimpleDictDTO;
@@ -30,4 +31,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<List<Long>> getDeptInfoByDeptIdList(String deptId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptInfoByDeptIdList", deptId);
     }
+
+    @Override
+    public Result<ParentAndAllDeptDTO> getParentAndAllDept(String depId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", depId);
+    }
 }

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java

@@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.QRCodeGenerator;
@@ -109,6 +111,7 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl<AcitveProductI
     @Override
     public PageData<AcitveProductInfoDTO> getPhrasePage(Map<String, Object> params) {
         IPage<AcitveProductInfoDTO> page = getPage(params);
+        params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
         List<AcitveProductInfoDTO> list = baseDao.getPhrasePage(params);
         return new PageData<>(list, page.getTotal());
     }
@@ -142,6 +145,16 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl<AcitveProductI
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(AcitveProductInfoDTO dto) {
+
+        // 查询所有部门信息
+        Result<ParentAndAllDeptDTO> alldtoResult = adminFeignClient.getParentAndAllDept(dto.getDeptId());
+        ParentAndAllDeptDTO parentAndAllDeptDTO = alldtoResult.getData();
+        dto.setDeptName(parentAndAllDeptDTO.getGrid());
+        dto.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds());
+        dto.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames());
+        dto.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds());
+        dto.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames());
+
         AcitveProductInfoEntity entity = ConvertUtils.sourceToTarget(dto, AcitveProductInfoEntity.class);
         insert(entity);
         // 添加权限表数据
@@ -167,6 +180,15 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl<AcitveProductI
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(AcitveProductInfoDTO dto) {
+        // 查询所有部门信息
+        Result<ParentAndAllDeptDTO> alldtoResult = adminFeignClient.getParentAndAllDept(dto.getDeptId());
+        ParentAndAllDeptDTO parentAndAllDeptDTO = alldtoResult.getData();
+        dto.setDeptName(parentAndAllDeptDTO.getGrid());
+        dto.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds());
+        dto.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames());
+        dto.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds());
+        dto.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames());
+
         AcitveProductInfoEntity entity = ConvertUtils.sourceToTarget(dto, AcitveProductInfoEntity.class);
         updateById(entity);
         // 逻辑删除权限表该商品数据

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml

@@ -62,8 +62,16 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND DATE_FORMAT( eapi.START_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>
+        <if test="deptId != null and deptId != ''">
+            and find_in_set(#{deptId},eapi.ALL_DEPT_IDS)
+        </if>
+        and eapi.DEPT_ID IN
+        <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+            #{deptId}
+        </foreach>
         order by eapi.UPDATED_TIME desc
     </select>
+
     <update id="deleteByProductId" parameterType="java.lang.String">
         update epdc_acitve_product_dept set DEL_FLAG = '1' where PRODUCT_ID = #{productId}
     </update>