Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/controller/ivt/FreezeController.java

@@ -85,4 +85,14 @@ public class FreezeController{
     public ResponseResultVO<?> update(@RequestBody FreezeVO freezeVO) {
         return freezeService.update(freezeVO);
     }
+
+    /**
+     * @desc : 通过ID获取编辑盘点单信息
+     * @author : 王英杰
+     * @date : 2024/3/28 15:34
+     */
+    @PostMapping({"update_freezeall/{id}"})
+    public ResponseResultVO updateFreezeAll(@PathVariable String id) {
+        return freezeService.updateFreezeAll(id);
+    }
 }

src/main/java/com/dk/mdm/controller/mst/StaffController.java

@@ -121,6 +121,18 @@ public class StaffController {
     }
 
     /**
+     * @desc : 注册商户时候插入  角色 基础资料（仓库 渠道 收入 支出 入库 出库 账户 来源 盈亏原因） 计量单位 种类  打印票据  等等。
+     *         返回角色的数据
+     * @author : 姜永辉
+     * @date : 2023/1/9 10:48
+     */
+    @ApiOperation(value = "注册商户时候插入基础信息", notes = "注册商户时候插入基础信息")
+    @PostMapping({"insert_feign_company_data"})
+    public ResponseResultVO<?> insertFeignCompanyData(@RequestBody Map<String, List<Map<String, Object>>> map) {
+        return staffService.insertFeignCompanyData(map);
+    }
+
+    /**
      * @desc : 编辑员工
      * @author : 姜永辉
      * @date : 2023/1/9 10:49

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -247,6 +247,7 @@
     <!-- 获取角色 -->
     <select id="getRole" resultType="java.util.Map">
         select role_Id    AS "roleId",
+               role_code  AS "roleCode",
                role_name  AS "roleName",
                display_no AS "displayNo",
                remarks
@@ -466,6 +467,7 @@
         tmgs.sku_model         as "skuModel",
         tmgs.brand_id          as "brandId",
         tmgb.brand_name        as "brandName",
+        tmgb.short_name        as "shortName",
         tmgs.category_id       as "categoryId",
         tmgc.cat_name          as "categoryName",
         tmgs.unit_id           as "unitId",
@@ -730,6 +732,9 @@
             <if test="cpId != null">
                 AND tmgb.cp_id = #{cpId}
             </if>
+            <if test="flgValid != null">
+                AND tmgb.flg_valid = #{flgValid}
+            </if>
         </where>
         order by tmgb.display_no asc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
@@ -805,11 +810,14 @@
         FROM dkic_b.t_mst_goods_brand tmgb
         <where>
             <if test="searchText !=null">
-                AND  tmgb.brand_name LIKE concat('%', #{searchText}, '%')
+                AND   tmgb.brand_name LIKE concat('%',my_ex.likequery(#{searchText}), '%')
             </if>
             <if test="cpId != null">
                 AND tmgb.cp_id = #{cpId}
             </if>
+            <if test="flgValid != null">
+                AND tmgb.flg_valid = #{flgValid}
+            </if>
         </where>
     </select>
     <!--    查询商品种类-->

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -97,6 +97,8 @@
         <result column="skuName" property="skuName"/>
         <result column="brandName" property="brandName"/>
         <result column="brand_name" property="brandName"/>
+        <result column="shortName" property="shortName"/>
+        <result column="short_name" property="shortName"/>
         <result column="orderQty" property="orderQty"/>
         <result column="canOutingQty" property="canOutingQty"/>
         <result column="whId" property="whId"/>
@@ -351,6 +353,7 @@
                tpoi.item_qty                                                             as "orderQty",
                tpoi.item_qty - tpoi.outing_qty - tpoi.out_qty + t.outing_qty + t.out_qty as "canOutingQty",
                tmgb.brand_name AS "brandName",
+               tmgb.short_name AS "shortName",
                t.price_out,
                t.outing_qty + t.out_qty                                                  as outing_qty,
                t.outing_amt + t.out_amt                                                  as outing_amt,
@@ -446,6 +449,7 @@
                t.sku_id,
                tmgs.sku_images,
                tmgb.brand_name,
+               tmgb.short_name,
                tmgs.sku_code                                                                         as "skuCode",
                tmgs.sku_model                                                                        as "skuModel",
                tmgs.sku_name                                                                         as "skuName",

src/main/java/com/dk/mdm/mapper/mst/OrgMapper.java

@@ -41,7 +41,14 @@ public interface OrgMapper extends BaseMapper<Org>{
      * @date   : 2023/1/10 17:20
      */
     Long countByCond(OrgQuery orgQuery);
+
+    /**
+     * @desc : 根据Id查询数据
+     * @author : 王英杰
+     * @date : 2024/2/26 10:36
+     */
     Org  selectById(@Param("id") String id);
+
     /**
      * @desc : 调用函数生成层级
      * @author : 王英杰

src/main/java/com/dk/mdm/mapper/mst/OrgMapper.xml

@@ -14,6 +14,7 @@
                  parent.org_id
                 ,parent.org_name
                 ,parent.parent_id
+                ,parent.flg_business
                 ,parent.display_no
                 ,parent.top_id
                 ,parent.level_upper
@@ -50,6 +51,7 @@
         tparent.org_id
         ,tparent.org_name
                 ,tparent.parent_id
+                ,tparent.flg_business
                 ,tparent.display_no
                 ,tparent.top_id
                 ,tparent.level_upper
@@ -87,6 +89,7 @@
         ,T.org_name
                 ,T.parent_id
                 ,T.display_no
+                ,T.flg_business
                 ,T.top_id
                 ,T.level_upper
                 ,T.level_lower
@@ -110,6 +113,7 @@
         <result column="parent_id" property="parentId" typeHandler="UuidTypeHandler"/>
         <result column="display_no" property="displayNo"/>
         <result column="parent_name" property="parentName"/>
+        <result column="flg_business" property="flgBusiness"/>
 
         <result column="top_id" property="topId" typeHandler="UuidTypeHandler"/>
         <result column="level_upper" property="levelUpper" typeHandler="UuidListTypeHandler"/>
@@ -141,6 +145,7 @@
         <id column="org_id" property="orgId"/>
         <result column="org_name" property="orgName"/>
         <result column="parent_id" property="parentId" typeHandler="UuidTypeHandler"/>
+        <result column="flg_business" property="flgBusiness"/>
         <result column="display_no" property="displayNo"/>
         <result column="top_id" property="topId" typeHandler="UuidTypeHandler"/>
         <result column="level_upper" property="levelUpper" typeHandler="UuidListTypeHandler"/>

src/main/java/com/dk/mdm/mapper/pur/PurchaseMapper.xml

@@ -881,6 +881,7 @@
             ,tmgsitem.sku_code  as "skuCode"
             ,tmgsitem.sku_model as "skuModel"
             ,tmgsitem.sku_name  as "skuName"
+            ,tmgsitem.sku_images  as "skuImages"
             ,tmgbitem.brand_name  as "brandName"
             ,tmgbitem.short_name  as "shortName"
             ,tmgsitem.sku_spec  as "skuSpec"

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -67,6 +67,7 @@
                 <result column="wh_name" property="whName"/>
                 <result column="order_no" property="orderNo"/>
         <result column="brand_name" property="brandName"/>
+        <result column="short_name" property="shortName"/>
         <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
                 <result column="transferableQuantity" property="transferableQuantity"/>
                 <result column="skuImages" property="skuImages" typeHandler="JsonTypeHandler"/>
@@ -157,6 +158,7 @@
                tmgs.sku_name  as "skuName",
                tmgs.sku_images,
                 tmgb.brand_name,
+                tmgb.short_name,
                t.item_qty,
                t.price_std,
                t.amt_std,

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -634,7 +634,8 @@
         tmgb.brand_name AS "brandName",
         tmgb.short_name AS "shortName",
         tmgs.price_purchase AS "pricePurchase",
-        tmgs.price_standard AS "priceStandard"
+        tmgs.price_standard AS "priceStandard",
+        tmgs.sku_images AS "skuImages"
         FROM
         dkic_b.t_psi_order_item toi
         LEFT JOIN dkic_b.t_mst_goods_sku tmgs ON tmgs.sku_id = toi.sku_id

src/main/java/com/dk/mdm/model/response/sale/OrderItemResponse.java

@@ -295,6 +295,8 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     @TableField(typeHandler = UuidTypeHandler.class)
     private String whId;
 
+    private String shortName;
+
     @Excel(name = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @ApiModelProperty(value = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @TableField(typeHandler = JsonTypeHandler.class)

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -284,6 +284,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
         }
         param.put("start", ((int) param.get("currentPage") - 1) * (int) param.get("pageSize"));
         param.put("end", param.get("pageSize"));
+        // 公司Id
+        StaffEntity staff = authUtils.getStaff();
+        param.put("cpId", staff.getCpId());
         // 选择对象的时候用
         if (param.get("supplier-customerList")!=null
                 && param.get("supplier-customerList")!=""

src/main/java/com/dk/mdm/service/ivt/FreezeService.java

@@ -45,10 +45,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -83,7 +80,6 @@ public class FreezeService extends BaseService<Freeze> {
 
 	@Autowired
 	private InventoryMapper inventoryMapper;
-
 	/**
 	 * @desc   : 重写主键
 	 * @author : 宋扬
@@ -217,17 +213,24 @@ public class FreezeService extends BaseService<Freeze> {
 	}
 
 
+	/**
+	 * @desc   : 全部解冻
+	 * @author : 王英杰
+	 * @date   : 2024/3/20 8:57
+	 */
 	@Transactional(
 			rollbackFor = {Exception.class}
 	)
-	public ResponseResultVO<?> updateFreeze(FreezeVO freezeVO) {
+	public ResponseResultVO<?> updateFreezeAll(String id) {
 
 		// 赋值全部解冻
 		String freezeStatus=Constant.FreezeStatusType.ALLUNFREEZE.getName();
 		// 查询冻结单明细
-
+		FreezeItemQuery freezeItemQuery = new FreezeItemQuery();
+		freezeItemQuery.setFreezeId(id);
+		List<FreezeItemResponse> itemList = freezeItemMapper.selectByCond(freezeItemQuery);
 		// 解冻
-		for (FreezeItemVO freezeItemVO : freezeVO.getItemList()) {
+		for (FreezeItemResponse freezeItemVO : itemList) {
 
 			FreezeItem freezeItem = new FreezeItem();
 			// 赋值实体
@@ -250,7 +253,7 @@ public class FreezeService extends BaseService<Freeze> {
 		}
 		// 赋值冻结表状态和ID
 		Freeze freeze=new Freeze();
-		freeze.setFreezeId(freezeVO.getFreezeId()).setFreezeStatus(freezeStatus);
+		freeze.setFreezeId(id).setFreezeStatus(freezeStatus);
 		// 更新主表冻结状态
 		return ResponseResultUtil.success(super.updateByUuid(freeze));
 	}

src/main/java/com/dk/mdm/service/mst/OrgService.java

@@ -3,7 +3,9 @@ package com.dk.mdm.service.mst;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.dk.common.infrastructure.annotaiton.Pagination;
 import com.dk.common.infrastructure.constant.Constant;
+import com.dk.common.infrastructure.enums.ErrorCodeEnum;
 import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.mst.OrgConvert;
@@ -25,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional
@@ -38,6 +41,7 @@ public class OrgService extends BaseService<Org> {
     public String getPrimaryKey() {
         return "org_id";
     }
+
     @Override
     public BaseMapper<Org> getRepository() {
         return orgMapper;
@@ -46,18 +50,17 @@ public class OrgService extends BaseService<Org> {
     @Autowired
     private OrgMapper orgMapper;
 
-
-
     @Autowired
     private OrgConvert orgConvert;
     @Autowired
     private CommonService commonService;
 
     @Autowired
-    OrgWhMapper orgWhMapper;
+    private OrgWhMapper orgWhMapper;
 
     @Autowired
-    OrgMacMapper orgMacMapper;
+    private OrgMacMapper orgMacMapper;
+
     /**
      * @desc : 条件查询
      * @author : 王英杰
@@ -65,17 +68,18 @@ public class OrgService extends BaseService<Org> {
      */
     @Pagination
     public ResponseResultVO<PageList<OrgResponse>> selectByCond(OrgQuery orgQuery) {
-        List<OrgResponse>   list = orgMapper.selectByCond(orgQuery);
+        List<OrgResponse> list = orgMapper.selectByCond(orgQuery);
         if (orgQuery.getParentId() != null) { //说明传这个id就是部门档案查三级部门以下有没有子级
             for (OrgResponse item : list) {
                 OrgQuery qry = new OrgQuery();
-                qry.setParentId( item.getOrgId());
+                qry.setParentId(item.getOrgId());
                 item.setItemDataLength(orgMapper.countByCond(qry));
             }
         }
         return super.mergeListWithCount(orgQuery, list,
                 orgMapper.countByCond(orgQuery));
     }
+
     /**
      * @desc : 条件查询
      * @author : 王英杰
@@ -88,18 +92,18 @@ public class OrgService extends BaseService<Org> {
         if (orgQuery.getParentId() != null) { //说明传这个id就是部门档案查三级部门以下有没有子级
             for (OrgResponse item : list) {
                 OrgQuery qry = new OrgQuery();
-                qry.setParentId( item.getOrgId());
+                qry.setParentId(item.getOrgId());
                 item.setItemDataLength(orgMapper.countByCond(qry));
             }
         }
 
-        return   ResponseResultUtil.success(list);
+        return ResponseResultUtil.success(list);
     }
 
     /**
-     * @desc   : 通过ID查询 带出对应的 组织资金账户 以及组织仓库
+     * @desc : 通过ID查询 带出对应的 组织资金账户 以及组织仓库
      * @author : 王英杰
-     * @date   : 2023/2/29 10:40
+     * @date : 2023/2/29 10:40
      */
     @Pagination
     public ResponseResultVO getById(String id) {
@@ -108,20 +112,26 @@ public class OrgService extends BaseService<Org> {
         orgResponse.setMacBeanList(orgMacMapper.selectByCond(new OrgMac().setOrgId(id)));
         return ResponseResultUtil.success(orgResponse);
     }
+
     /**
-     * @desc   : 微信小程序 查询选择部门数据
+     * @desc : 微信小程序 查询选择部门数据
      * @author : 宋扬
-     * @date   : 2023/2/29 10:40
+     * @date : 2023/2/29 10:40
      */
     @Pagination
-    public ResponseResultVO<List<OrgResponse>>  selectChooseOrg( OrgQuery orgQuery) {
-        if(orgQuery.getOrgId()!=null){
-            Org org =   orgMapper.selectById(orgQuery.getOrgId()); //查出上级部门的 层级代码
+    public ResponseResultVO<List<OrgResponse>> selectChooseOrg(OrgQuery orgQuery) {
+        // 查出当前部门，进行过滤
+        if (orgQuery.getOrgId() != null) {
+            Org org = orgMapper.selectById(orgQuery.getOrgId()); //查出部门的 层级代码
             orgQuery.setLevelCode(org.getLevelCode());
             orgQuery.setFilterFlag("ok");
         }
-        return ResponseResultUtil.success(orgMapper.selectChooseOrg(orgQuery));
+        String parentId = orgQuery.getParentId();
+        List<OrgResponse> orgResponseList = orgMapper.selectChooseOrg(orgQuery.setParentId(null));
+        return ResponseResultUtil.success(orgResponseList.stream().
+                filter(it -> !it.getOrgId().equals(parentId)).collect(Collectors.toList()));
     }
+
     /**
      * @desc : 新建组织机构
      * @author : 王英杰
@@ -133,6 +143,14 @@ public class OrgService extends BaseService<Org> {
     public ResponseResultVO<?> insert(OrgVO orgVO) {
         // 转化实体
         Org organization = orgConvert.convertToPo(orgVO);
+        // 如果父级部门的是业务部门标识，就不能有子级
+        if(organization.getParentId() != null ){
+            Org checkOrg = orgMapper.selectById(organization.getParentId());
+            if(checkOrg != null && checkOrg.getFlgBusiness() != null && checkOrg.getFlgBusiness()){
+                //系统预制 无法编辑
+                return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ORG_PARENT_IS_BUSINESS.getMessage());
+            }
+        }
         Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.ORG.getName(), true);
         // 获取编码和主键UuId
         organization.setOrgId(codeMap.get("outId").toString());
@@ -141,8 +159,8 @@ public class OrgService extends BaseService<Org> {
         //查询 本次要加的 部门的 父级下 最大的DisplayNo  然后加1  就是现在要加的DisplayNo
         Map<String, Object> param = new HashMap<>();
         param.put("otherCond", "parent_id = #{parentID} ::uuid");
-        param.put("parentId",organization.getParentId());
-        organization.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.ORG ,param));
+        param.put("parentId", organization.getParentId());
+        organization.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.ORG, param));
         if (organization.getParentId() != null) {
             Org org = orgMapper.selectById(organization.getParentId());
             //插入TOPid
@@ -158,9 +176,9 @@ public class OrgService extends BaseService<Org> {
         if (orgVO.getWarehouseList() != null && orgVO.getWarehouseList().size() > 0) {
             for (Map<String, Object> map : orgVO.getWarehouseList()) {
                 // 获取显示顺序
-                Map<String, Object> paramOrgWh=new HashMap<>();
-                paramOrgWh.put("noFlgValid",true);
-                Integer orgWhDisplayNo = commonService.getMaxDisplayNo(Constant.DisplayNoTable.ORGWH,paramOrgWh);
+                Map<String, Object> paramOrgWh = new HashMap<>();
+                paramOrgWh.put("noFlgValid", true);
+                Integer orgWhDisplayNo = commonService.getMaxDisplayNo(Constant.DisplayNoTable.ORGWH, paramOrgWh);
                 OrgWh orgWh = new OrgWh();
                 orgWh.setOrgId(organization.getOrgId()).setWhId(map.get("whId").toString()).setDisplayNo(orgWhDisplayNo)
                         .setFlgDefault(Boolean.parseBoolean(map.get("ownerFlag").toString()));
@@ -172,10 +190,10 @@ public class OrgService extends BaseService<Org> {
         if (orgVO.getMacList() != null && orgVO.getMacList().size() > 0) {
             for (Map<String, Object> map : orgVO.getMacList()) {
                 // 获取显示顺序
-                Map<String, Object> paramOrgMac=new HashMap<>();
-                paramOrgMac.put("noFlgValid",true);
-                Integer orgMacDisplayNo = commonService.getMaxDisplayNo(Constant.DisplayNoTable.ORGMAC,paramOrgMac);
-                OrgMac orgMac=new OrgMac();
+                Map<String, Object> paramOrgMac = new HashMap<>();
+                paramOrgMac.put("noFlgValid", true);
+                Integer orgMacDisplayNo = commonService.getMaxDisplayNo(Constant.DisplayNoTable.ORGMAC, paramOrgMac);
+                OrgMac orgMac = new OrgMac();
                 orgMac.setOrgId(organization.getOrgId()).setMacId(map.get("macId").toString()).setDisplayNo(orgMacDisplayNo)
                         .setFlgDefault(Boolean.parseBoolean(map.get("ownerFlag").toString()));
                 orgMacMapper.insert(orgMac);
@@ -200,7 +218,7 @@ public class OrgService extends BaseService<Org> {
         Org organization = orgConvert.convertToPo(orgVO);
         // 获取显示顺序
         Map<String, Object> codeMap = commonService.getUniqueNoteCode(
-                Constant.docNameConstant.ORG.getName(),orgVO.getCpId(), true);
+                Constant.docNameConstant.ORG.getName(), orgVO.getCpId(), true);
         // 获取编码和主键UuId
         organization.setDisplayNo(0);
         organization.setOrgId(codeMap.get("outId").toString());
@@ -213,9 +231,9 @@ public class OrgService extends BaseService<Org> {
     }
 
     /**
-     * @desc   : 编辑方法
+     * @desc : 编辑方法
      * @author : 宋扬
-     * @date   : 2024/3/22 17:15
+     * @date : 2024/3/22 17:15
      */
     @Transactional(
             rollbackFor = {Exception.class}
@@ -223,6 +241,23 @@ public class OrgService extends BaseService<Org> {
     public ResponseResultVO<Boolean> update(OrgVO orgVO) {
         // 转化实体
         Org org = orgConvert.convertToPo(orgVO);
+
+        // 如果是业务部门标识，那么不能有子级
+        if (org.getFlgBusiness() != null && org.getFlgBusiness()) {
+            Long childCount = orgMapper.countByCond(new OrgQuery().setParentId(org.getOrgId()));
+            if (childCount > 0) {
+                // 部门有子级不允许修改为业务部门
+                return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ORG_BUSINESS_HAS_CHILD.getMessage());
+            }
+        }
+        // 如果父级部门的是业务部门标识，就不能有子级
+        if(org.getParentId() != null ){
+            Org checkOrg = orgMapper.selectById(org.getParentId());
+            if(checkOrg != null && checkOrg.getFlgBusiness() != null && checkOrg.getFlgBusiness()){
+                //系统预制 无法编辑
+                return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ORG_PARENT_IS_BUSINESS.getMessage());
+            }
+        }
         // 修改组织机构
         super.update(org, new UpdateWrapper<Org>().lambda().eq(Org::getOrgId,
                 UUID.fromString(org.getOrgId())));
@@ -240,9 +275,9 @@ public class OrgService extends BaseService<Org> {
         if (orgVO.getWarehouseList() != null && orgVO.getWarehouseList().size() > 0) {
             for (Map<String, Object> map : orgVO.getWarehouseList()) {
                 // 获取显示顺序
-                Map<String, Object> paramOrgWh=new HashMap<>();
-                paramOrgWh.put("noFlgValid",true);
-                Integer orgWhDisplayNo = commonService.getMaxDisplayNo(Constant.DisplayNoTable.ORGWH,paramOrgWh);
+                Map<String, Object> paramOrgWh = new HashMap<>();
+                paramOrgWh.put("noFlgValid", true);
+                Integer orgWhDisplayNo = commonService.getMaxDisplayNo(Constant.DisplayNoTable.ORGWH, paramOrgWh);
                 OrgWh orgWh = new OrgWh();
                 orgWh.setOrgId(org.getOrgId()).setWhId(map.get("whId").toString()).setDisplayNo(orgWhDisplayNo)
                         .setFlgDefault(Boolean.parseBoolean(map.get("ownerFlag").toString()));
@@ -254,10 +289,10 @@ public class OrgService extends BaseService<Org> {
         if (orgVO.getMacList() != null && orgVO.getMacList().size() > 0) {
             for (Map<String, Object> map : orgVO.getMacList()) {
                 // 获取显示顺序
-                Map<String, Object> paramOrgMac=new HashMap<>();
-                paramOrgMac.put("noFlgValid",true);
-                Integer orgMacDisplayNo = commonService.getMaxDisplayNo(Constant.DisplayNoTable.ORGMAC,paramOrgMac);
-                OrgMac orgMac=new OrgMac();
+                Map<String, Object> paramOrgMac = new HashMap<>();
+                paramOrgMac.put("noFlgValid", true);
+                Integer orgMacDisplayNo = commonService.getMaxDisplayNo(Constant.DisplayNoTable.ORGMAC, paramOrgMac);
+                OrgMac orgMac = new OrgMac();
                 orgMac.setOrgId(org.getOrgId()).setMacId(map.get("macId").toString()).setDisplayNo(orgMacDisplayNo)
                         .setFlgDefault(Boolean.parseBoolean(map.get("ownerFlag").toString()));
                 orgMacMapper.insert(orgMac);

src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -188,6 +188,19 @@ public class StaffService extends BaseService<Staff> {
     }
 
     /**
+     * @desc : 注册商户时候插入  角色 基础资料（仓库 渠道 收入 支出 入库 出库 账户 来源 盈亏原因） 计量单位 种类  打印票据  等等。
+     *         返回角色的数据
+     * @author : 姜永辉
+     * @date : 2023/1/9 10:49
+     */
+    @Transactional(rollbackFor = {Exception.class})
+    public ResponseResultVO<?> insertFeignCompanyData(Map<String, List<Map<String, Object>>> map) {
+
+        return ResponseResultUtil.success(null);
+    }
+
+
+    /**
      * @desc : 保存方法-邀请员工的确定
      * @author : 姜永辉
      * @date : 2023/1/9 10:49