Просмотр исходного кода

Merge remote-tracking branch 'origin/dev' into dev

zk 2 лет назад
Родитель
Сommit
6f5992cc04
19 измененных файлов с 266 добавлено и 31 удалено
  1. 2 1
      sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java
  2. 6 4
      sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/BannerDistrictEnum.java
  3. 1 3
      sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/constant/HttpStatus.java
  4. 32 0
      sckw-common/sckw-common-stream/src/main/java/com/sckw/stream/enums/MessageEnum.java
  5. 23 9
      sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java
  6. 24 0
      sckw-modules/sckw-operation/src/main/java/com/sckw/operation/controller/KwoBannerController.java
  7. 5 0
      sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/entity/KwoBanner.java
  8. 4 2
      sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/req/BannerAddReqVo.java
  9. 32 0
      sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/req/BannerUpdateStatusReqVo.java
  10. 26 0
      sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/res/BannerCategoryResVo.java
  11. 5 0
      sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/res/BannerDetailResVo.java
  12. 5 0
      sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/res/BannerQueryResVo.java
  13. 45 2
      sckw-modules/sckw-operation/src/main/java/com/sckw/operation/service/BannerService.java
  14. 3 0
      sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java
  15. 0 1
      sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsDeptController.java
  16. 9 0
      sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsEnterpriseDao.java
  17. 2 0
      sckw-modules/sckw-system/src/main/java/com/sckw/system/model/pojo/FindManagePojo.java
  18. 14 7
      sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java
  19. 28 2
      sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

+ 2 - 1
sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -448,9 +448,10 @@ public class AuthServiceImpl implements IAuthService {
         loginRes.setRoleId(user.getRoleId());
         if (user.getSystemType().equals(SystemTypeEnum.MANAGE.getCode())) {
             loginRes.setValid(true);
+        } else {
+            loginRes.setValid(!Objects.isNull(enterprise) && enterprise.getValid());
         }
 
-        loginRes.setValid(Objects.isNull(enterprise) ? false : enterprise.getValid());
         return HttpResult.ok(loginRes);
     }
 

+ 6 - 4
sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/bannerDistrictEnum.java → sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/BannerDistrictEnum.java

@@ -8,7 +8,7 @@ import lombok.Getter;
  * @date 2023/6/15
  */
 @Getter
-public enum bannerDistrictEnum {
+public enum BannerDistrictEnum {
 
     //首页
     BANNER_ZERO(0, "首页"),
@@ -29,17 +29,19 @@ public enum bannerDistrictEnum {
 
 
 
+    
+
     private final int code;
 
     private final String name;
 
-    bannerDistrictEnum(int code, String name){
+    BannerDistrictEnum(int code, String name){
         this.code = code;
         this.name = name;
     }
 
-    public static bannerDistrictEnum getName(int code){
-        for (bannerDistrictEnum addressDefaultTypeEnum : values()) {
+    public static BannerDistrictEnum getName(int code){
+        for (BannerDistrictEnum addressDefaultTypeEnum : values()) {
             if (addressDefaultTypeEnum.getCode() == code) {
                 return addressDefaultTypeEnum;
             }

+ 1 - 3
sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/constant/HttpStatus.java

@@ -183,11 +183,9 @@ public class HttpStatus {
     public static final String MSG_029 = "合同编号超长!";
     public static final String MSG_030 = "合同名称超长!";
     public static final String MSG_031 = "您与所选企业存在未完结销售订单,当前无法删除!";
-
     public static final String MSG_032 = "您与所选企业存在未完结托运承运订单,当前无法删除!";
-
     public static final String MSG_033 = "当前企业资质在审核中,无法删除!";
-
     public static final String MSG_034 = "您与所选企业存在未完结对账单,当前无法删除!";
+    public static final String MSG_035 = "地址信息已存在";
 
 }

+ 32 - 0
sckw-common/sckw-common-stream/src/main/java/com/sckw/stream/enums/MessageEnum.java

@@ -294,8 +294,40 @@ public enum MessageEnum {
             "【${company}】发起了对贵司的付款操作,请及时联系付款方进行确认;结算单号:${number}", "terminal,ios,android",""),
     SETTLEMENT_START_SHIPPER("BUSINESS", "SETTLEMENT_START_SHIPPER", "发起托运付款",
             "贵司已发起了对【${company}】的付款操作,请及时确认并联系收款单位;结算单号:${number}", "terminal,ios,android",""),
+
+    /**
+     * 合同-销售合同、托运合同
+     */
+    SAELCONTRACT_SUBMIT_DATA("BUSINESS", "SAELCONTRACT_SUBMIT_DATA", "发起补充合同签约",
+            "贵司新建了补充合同并发起与【${entName}】的合同签约流程,请留意电话短信;合同编号:${contract_no},合同名称:${name}", "terminal,ios,android", ""),
+
+    SAELCONTRACT_COMPLETE_CONTRACT("BUSINESS", "SAELCONTRACT_COMPLETE_CONTRACT", "完结合同",
+            "贵司已完结了与【${entName}】间的签约合同,请及时通知合作单位;合同编号:${contract_no},合同名称:${name}", "terminal,ios,android", ""),
+
+    SAELCONTRACT_SEND_CONTRACT("BUSINESS", "SAELCONTRACT_SEND_CONTRACT", "发起合同签约",
+            "贵司新建了合同并发起与【${entName}】的合同签约流程,请留意电话短信;合同编号:${contract_no},合同名称:${name}", "terminal,ios,android", ""),
+    SAELCONTRACT_SUCCESS_CONTRACT("BUSINESS", "SAELCONTRACT_SUCCESS_CONTRACT", "合同签约成功",
+            "贵司已成功与【${entName}】签约合同;合同编号:${contract_no},合同名称:${name}", "terminal,ios,android", ""),
+    /**
+     * 合同-采购合同、承运合同
+     */
+    BUYCONTRACT_PROCESS_SEND("BUSINESS", "SAELCONTRACT_SUBMIT_DATA", "合同签约流程已发起",
+            "【${entName}】新建合同并发起签约流程,请留意电话短信;合同编号:${contract_no},合同名称:${name}", "terminal,ios,android", ""),
+    BUYCONTRACT_SUPPLYPROCESS_SEND("BUSINESS", "BUYCONTRACT_SUPPLYPROCESS_SEND", "补充合同签约流程已发起",
+            "【${entName}】新建补充合同并发起签约流程,请留意电话短信;合同编号:${contract_no},合同名称:${name}", "terminal,ios,android", ""),
+    BUYCONTRACT_SUCCESS_CONTRACT("BUSINESS", "BUYCONTRACT_SUCCESS_CONTRACT", "合同签约成功",
+            "贵司已成功与【${entName}】签约合同;合同编号:${contract_no},合同名称:${name}", "terminal,ios,android", ""),
+    BUYCONTRACT_COMPLETE_CONTRACT("BUSINESS", "BUYCONTRACT_COMPLETE_CONTRACT", "合同被完结",
+            "【${entName}】完结了与贵司签约的合同,请及时联系确认;;合同编号:${contract_no},合同名称:${name}", "terminal,ios,android", ""),
+
+
+
     ;
 
+
+
+
+
     /**
      * 消息分类:BUSINESS业务消息,SYSTEM系统消息
      */

+ 23 - 9
sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -270,6 +270,8 @@ public class KwmAddressService {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ADDRESS_NOT_EXISTS);
         }
 
+        checkAddressRepeat(reqVo.getName(), reqVo.getDetailAddress(), kwmAddress.getId());
+
         BeanUtils.copyProperties(reqVo, kwmAddress);
         if (kwmAddressMapper.updateById(kwmAddress) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
@@ -286,15 +288,7 @@ public class KwmAddressService {
      */
     @Transactional(rollbackFor = {})
     public void add(AddressAddReqVo reqVo) {
-        LambdaQueryWrapper<KwmAddress> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(KwmAddress::getName, reqVo.getName()).
-                eq(KwmAddress::getDelFlag, Global.NO).
-                eq(KwmAddress::getStatus, Global.NO).
-                eq(KwmAddress::getEntId, LoginUserHolder.getEntId());
-        if (kwmAddressMapper.selectCount(wrapper).compareTo((long) Global.NUMERICAL_ZERO) > 0) {
-            throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.ADDRESS_EXISTS);
-        }
-
+        checkAddressRepeat(reqVo.getName(), reqVo.getDetailAddress(), null);
         KwmAddress kwmAddress = new KwmAddress();
         BeanUtils.copyProperties(reqVo, kwmAddress);
         Long userId = LoginUserHolder.getUserId();
@@ -313,6 +307,26 @@ public class KwmAddressService {
         }
     }
 
+    private void checkAddressRepeat(String name, String detailAddress, Long id) {
+        LambdaQueryWrapper<KwmAddress> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(KwmAddress::getDelFlag, Global.NO).
+                eq(KwmAddress::getStatus, Global.NO).
+                eq(KwmAddress::getEntId, LoginUserHolder.getEntId()).and(
+                        wp -> wp.eq(KwmAddress::getName, name).or().eq(KwmAddress::getDetailAddress, detailAddress)
+                );
+        List<KwmAddress> kwmAddressList = kwmAddressMapper.selectList(wrapper);
+        if (CollectionUtils.isNotEmpty(kwmAddressList) && Objects.isNull(id)) {
+            throw new SystemException(HttpStatus.CODE_10301, HttpStatus.MSG_035);
+        }
+
+        if (CollectionUtils.isNotEmpty(kwmAddressList) && Objects.nonNull(id)) {
+            List<KwmAddress> kwmAddressList1 = kwmAddressList.stream().filter(item -> !item.getId().equals(id)).toList();
+            if (CollectionUtils.isNotEmpty(kwmAddressList1)) {
+                throw new SystemException(HttpStatus.CODE_10301, HttpStatus.MSG_035);
+            }
+        }
+    }
+
 
     /**
      * @param ids 主键

+ 24 - 0
sckw-modules/sckw-operation/src/main/java/com/sckw/operation/controller/KwoBannerController.java

@@ -86,6 +86,30 @@ public class KwoBannerController {
     public HttpResult detail(@RequestBody IdsReqVo reqVo) throws SystemException {
         return HttpResult.ok(bannerService.detailServer(reqVo.getId()));
     }
+    /**
+     * @return HttpResult
+     * @desc: 获取分类
+     * @author: sky
+     * @date: 2023/9/12
+     */
+    @PostMapping("/getCategory")
+    public HttpResult getCategory() throws SystemException {
+        return HttpResult.ok(bannerService.getCategory());
+    }
+
+    /**
+     * @param reqVo 上架下架
+     * @return HttpResult
+     * @desc: 上架下架
+     * @author: sky
+     * @date: 2023/8/28
+     */
+    @PostMapping("/updateStatus")
+    public HttpResult updateStatus(@Valid @RequestBody BannerUpdateStatusReqVo reqVo) throws SystemException {
+        bannerService.updateStatusServer(reqVo);
+        return HttpResult.ok(HttpStatus.MSG_005);
+    }
+
 
 
 

+ 5 - 0
sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/entity/KwoBanner.java

@@ -20,6 +20,11 @@ public class KwoBanner implements Serializable {
     @TableId
     private Long id;
 
+    /**
+     * 名称
+     */
+    private String name;
+
     /**
      * 展示图片
      */

+ 4 - 2
sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/req/BannerAddReqVo.java

@@ -24,6 +24,10 @@ public class BannerAddReqVo extends PageRequest implements Serializable {
     private static final long serialVersionUID = 5677297006062954377L;
 
     private Long id;
+
+    @NotBlank(message = "名称不能为空")
+    @Size(max = 40, message = "名称内容超长")
+    private String name;
     /**
      * 展示图片
      */
@@ -33,7 +37,6 @@ public class BannerAddReqVo extends PageRequest implements Serializable {
     /**
      * 跳转地址
      */
-    @NotBlank(message = "跳转地址不能为空")
     @Size(max = 100, message = "跳转地址超长")
     private String jumpUrl;
 
@@ -56,7 +59,6 @@ public class BannerAddReqVo extends PageRequest implements Serializable {
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @NotNull(message = "结束时间不能为空")
     private Date endTime;
 
     /**

+ 32 - 0
sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/req/BannerUpdateStatusReqVo.java

@@ -0,0 +1,32 @@
+package com.sckw.operation.model.vo.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.page.PageRequest;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author sky
+ * @desc 上架下架
+ * @date 2023/7/10
+ */
+@Data
+public class BannerUpdateStatusReqVo extends PageRequest implements Serializable {
+    private Long id;
+
+
+    /**
+     * 状态(0 草稿 1已发布 2取消发布)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+
+}

+ 26 - 0
sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/res/BannerCategoryResVo.java

@@ -0,0 +1,26 @@
+package com.sckw.operation.model.vo.res;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.sckw.core.utils.LongToStringUtils;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author sky
+ * @desc 查询返参
+ * @date 2023/7/12
+ */
+@Data
+public class BannerCategoryResVo implements Serializable {
+    /**
+     * 主键
+     */
+    private Integer code;
+
+    private String name;
+
+}

+ 5 - 0
sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/res/BannerDetailResVo.java

@@ -25,6 +25,11 @@ public class BannerDetailResVo extends PageRequest implements Serializable {
      */
     private Long id;
 
+    /**
+     * 名称
+     */
+    private String name;
+
     /**
      * 展示图片
      */

+ 5 - 0
sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/res/BannerQueryResVo.java

@@ -24,6 +24,11 @@ public class BannerQueryResVo implements Serializable {
     @JsonSerialize(using = LongToStringUtils.class)
     private Long id;
 
+    /**
+     * 名字
+     */
+    private String name;
+
     /**
      * 展示图片
      */

+ 45 - 2
sckw-modules/sckw-operation/src/main/java/com/sckw/operation/service/BannerService.java

@@ -10,6 +10,7 @@ import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.AddressDefaultTypeEnum;
+import com.sckw.core.model.enums.ContractStatusEnum;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.BeanUtils;
@@ -19,6 +20,7 @@ import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.operation.model.vo.req.BannerAddReqVo;
+import com.sckw.operation.model.vo.req.BannerUpdateStatusReqVo;
 import com.sckw.operation.model.vo.res.*;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import com.sckw.operation.dao.KwoBannerMapper;
@@ -28,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.sckw.operation.model.entity.KwoBanner;
-import com.sckw.core.model.enums.bannerDistrictEnum;
+import com.sckw.core.model.enums.BannerDistrictEnum;
 
 /**
  * @author sky
@@ -119,7 +121,7 @@ public class BannerService {
             }
 
             if (Objects.nonNull(item.getDistrict())) {
-                bannerQueryResVo.setDistrictName(bannerDistrictEnum.getName(item.getDistrict()).getName());
+                bannerQueryResVo.setDistrictName(BannerDistrictEnum.getName(item.getDistrict()).getName());
             }
 
             list.add(bannerQueryResVo);
@@ -218,4 +220,45 @@ public class BannerService {
         return bannerDetailResVo;
     }
 
+    /**
+     * @return HttpResult
+     * @desc: 获取分类
+     * @author: sky
+     * @date: 2023/7/12
+     */
+    public List<BannerCategoryResVo> getCategory() {
+        BannerDistrictEnum[] values =  BannerDistrictEnum.values();
+        List<BannerCategoryResVo> list = new ArrayList<>();
+        for (BannerDistrictEnum bannerDistrictEnum : values) {
+            BannerCategoryResVo bannerCategoryResVo = new BannerCategoryResVo();
+            bannerCategoryResVo.setCode(bannerDistrictEnum.getCode());
+            bannerCategoryResVo.setName(bannerDistrictEnum.getName());
+            list.add(bannerCategoryResVo);
+        }
+        return list;
+    }
+
+    /**
+     * @param reqVo 上架下架入参
+     * @desc: 更新banner
+     * @author: sky
+     * @date: 2023/8/29
+     */
+    @Transactional(rollbackFor = {})
+    public void updateStatusServer(BannerUpdateStatusReqVo reqVo) {
+        KwoBanner kwobanner = kwoBannerMapper.selectById(reqVo.getId());
+        if (Objects.isNull(kwobanner)) {
+            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.BANNER_NOT_EXISTS);
+        }
+        //BeanUtils.copyProperties(reqVo, kwobanner);
+        Date date = new Date();
+        Long userId = LoginUserHolder.getUserId();
+        kwobanner.setUpdateTime(date);
+        kwobanner.setUpdateBy(userId);
+        kwobanner.setStatus(reqVo.getStatus());
+        if (kwoBannerMapper.updateById(kwobanner) <= 0) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
+        }
+    }
+
 }

+ 3 - 0
sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -670,6 +670,9 @@ public class KwpGoodsService {
         if (Objects.equals(GoodsStatusEnum.PUT_ON_SHELVES.getCode(), goods.getStatus())) {
             throw new BusinessException("上架操作仅针对“已下架”“草稿”状态的单据!");
         }
+        if (goods.getAmount().compareTo(BigDecimal.ZERO) <= 0) {
+            throw new BusinessException("商品上架必须库存大于零!");
+        }
         if (Objects.equals(GoodsStatusEnum.SAVED.getCode(), goods.getStatus())) {
             UpdateGoodsParam updateParam = BeanUtils.copyProperties(goods, UpdateGoodsParam.class);
             updateParam.setAttributes(BeanUtils.copyToList(kwpGoodsAttributeService.getByGoodsId(id), GoodsAttributes.class));

+ 0 - 1
sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsDeptController.java

@@ -30,7 +30,6 @@ public class KwsDeptController {
      **/
     @GetMapping("/detail")
     public HttpResult selectByKey(@RequestParam Long id) {
-        int i = 1 / 0;
         KwsDept sysDict = kwsDeptService.selectByKey(id);
         return HttpResult.ok(sysDict);
     }

+ 9 - 0
sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsEnterpriseDao.java

@@ -115,6 +115,15 @@ public interface KwsEnterpriseDao {
      */
     FindManagePojo findManageInfoByEntId(Long entId);
 
+    /**
+     * @param entId 企业id
+     * @return FindManagePojo
+     * @desc: 查企业的管理员
+     * @author: czh
+     * @date: 2023/6/29
+     */
+    List<FindManagePojo> findManageInfoByEntIds(@Param(value = "list") List<Long> entId);
+
     /**
      * @param entId 企业id
      * @return FindManagePojo

+ 2 - 0
sckw-modules/sckw-system/src/main/java/com/sckw/system/model/pojo/FindManagePojo.java

@@ -22,4 +22,6 @@ public class FindManagePojo implements Serializable {
 
     private Long roleId;
 
+    private Long entId;
+
 }

+ 14 - 7
sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -35,6 +35,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -910,13 +911,16 @@ public class KwsEnterpriseService {
             collect = kwsEntTypeList.stream().collect(Collectors.groupingBy(KwsEntType::getEntId));
         }
 
-        List<Long> managers = kwsEnterprises.stream().map(KwsEnterprise::getManager).toList();
+        List<FindManagePojo> manageInfoByEntIds = kwsEnterpriseDao.findManageInfoByEntIds(kwsEnterprises.stream().map(KwsEnterprise::getId).toList());
         Map<Long, KwsUser> userCollect = new HashMap<>(Global.NUMERICAL_SIXTEEN);
-        if (CollectionUtils.isNotEmpty(managers)) {
-            List<KwsUser> kwsUsers = kwsUserService.selectByKeys(managers);
+        Map<Long, FindManagePojo> manageInfoCollect = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        if (CollectionUtils.isNotEmpty(manageInfoByEntIds)) {
+            List<KwsUser> kwsUsers = kwsUserService.selectByKeys(manageInfoByEntIds.stream().map(FindManagePojo::getUserId).toList());
             if (CollectionUtils.isNotEmpty(kwsUsers)) {
                 userCollect = kwsUsers.stream().collect(Collectors.toMap(KwsUser::getId, e -> e, (n, o) -> n));
             }
+
+            manageInfoCollect = manageInfoByEntIds.stream().collect(Collectors.toMap(FindManagePojo::getEntId, Function.identity()));
         }
 
 
@@ -925,14 +929,17 @@ public class KwsEnterpriseService {
             QueryCurrentOrganizationResVo queryCurrentOrganizationResVo = new QueryCurrentOrganizationResVo();
             List<KwsEntType> kwsEntTypeList1 = collect.get(kwsEnterprise.getId());
             queryCurrentOrganizationResVo.setEntTypes(CollectionUtils.isEmpty(kwsEntTypeList1) ? null : String.join(Global.COMMA, kwsEntTypeList1.stream().map(KwsEntType::getType).map(String::valueOf).toList()));
-            Long manager = kwsEnterprise.getManager();
-            if (Objects.nonNull(manager)) {
-                queryCurrentOrganizationResVo.setContactsId(manager);
-                KwsUser kwsUser = userCollect.get(manager);
+            FindManagePojo findManagePojo = manageInfoCollect.get(kwsEnterprise.getId());
+            if (Objects.nonNull(findManagePojo)) {
+                queryCurrentOrganizationResVo.setContactsId(findManagePojo.getUserId());
+                KwsUser kwsUser = userCollect.get(findManagePojo.getUserId());
                 if (Objects.nonNull(kwsUser)) {
                     queryCurrentOrganizationResVo.setContacts(kwsUser.getName());
                     queryCurrentOrganizationResVo.setPhone(kwsUser.getPhone());
                 }
+            } else {
+                queryCurrentOrganizationResVo.setContacts(kwsEnterprise.getContacts());
+                queryCurrentOrganizationResVo.setPhone(kwsEnterprise.getPhone());
             }
             queryCurrentOrganizationResVo.setCityName(kwsEnterprise.getCityName());
             queryCurrentOrganizationResVo.setBusiness(kwsEnterprise.getBusiness());

+ 28 - 2
sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -236,7 +236,8 @@
   <select id="findManageInfoByEntId" resultType="com.sckw.system.model.pojo.FindManagePojo">
     select distinct d.id userId,
            b.id deptId,
-           f.id roleId
+           f.id roleId,
+           a.id entId
       from kws_enterprise a
       left join kws_dept b on a.id = b.ent_id
       left join kws_user_dept c on b.id = c.dept_id
@@ -326,7 +327,32 @@
                     )
     </select>
 
-    <insert id="insert" parameterType="com.sckw.system.model.KwsEnterprise">
+  <select id="findManageInfoByEntIds" resultType="com.sckw.system.model.pojo.FindManagePojo">
+    select distinct d.id userId,
+                    b.id deptId,
+                    f.id roleId,
+                    a.id entId
+      from kws_enterprise a
+             left join kws_dept b on a.id = b.ent_id
+             left join kws_user_dept c on b.id = c.dept_id
+             left join kws_user d on c.user_id = d.id
+             left join kws_user_role e on d.id = e.user_id
+             left join kws_role f on e.role_id = f.id
+      where a.del_flag = 0
+        and b.del_flag = 0
+        and c.del_flag = 0
+        and d.del_flag = 0
+        and e.del_flag = 0
+        and f.del_flag = 0
+        and d.is_main = 1
+        and d.system_type = 2
+        and a.id in
+      <foreach collection="list" separator="," open="(" close=")" item="item">
+        #{item}
+      </foreach>
+  </select>
+
+  <insert id="insert" parameterType="com.sckw.system.model.KwsEnterprise">
     insert into kws_enterprise
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">