优化员工关联小区

wuxw

2025-03-18 e9d2cea09ab7dd91fe4044c579a6b803d95fb337

 service-user/src/main/java/com/java110/user/cmd/org/UpdateOrgCmd.java

@@ -19,9 +19,9 @@
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.org.OrgDto;
import com.java110.intf.user.IOrgV1InnerServiceSMO;
import com.java110.po.org.OrgPo;
import com.java110.utils.exception.CmdException;
@@ -31,6 +31,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.List;


/**
@@ -44,7 +46,7 @@
 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
 */
@Java110Cmd(serviceCode = "org.updateOrg")
public class UpdateOrgCmd extends AbstractServiceCmdListener {
public class UpdateOrgCmd extends Cmd {

  private static Logger logger = LoggerFactory.getLogger(UpdateOrgCmd.class);

@@ -54,8 +56,14 @@

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "orgId", "orgId不能为空");
Assert.hasKeyAndValue(reqJson, "storeId", "storeId不能为空");
        Assert.hasKeyAndValue(reqJson, "orgId", "组织ID不能为空");
        Assert.hasKeyAndValue(reqJson, "orgName", "必填，请填写组织名称");
        Assert.hasKeyAndValue(reqJson, "orgLevel", "必填，请填写报修人名称");
        Assert.hasKeyAndValue(reqJson, "parentOrgId", "必填，请选择上级ID");
        //Assert.hasKeyAndValue(reqJson, "description", "必填，请填写描述");
        String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
        reqJson.put("storeId", storeId);
        Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");

    }

@@ -63,7 +71,19 @@
    @Java110Transactional
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {

       OrgPo orgPo = BeanConvertUtil.covertBean(reqJson, OrgPo.class);
        OrgDto orgDto = new OrgDto();
        orgDto.setOrgId(reqJson.getString("orgId"));
        orgDto.setStoreId(reqJson.getString("storeId"));
        List<OrgDto> orgDtos = orgV1InnerServiceSMOImpl.queryOrgs(orgDto);

        Assert.listOnlyOne(orgDtos, "未查询到组织信息 或查询到多条数据");

        JSONObject businessOrg = new JSONObject();
        businessOrg.putAll(reqJson);
        businessOrg.put("allowOperation", orgDtos.get(0).getAllowOperation());
        businessOrg.put("belongCommunityId", orgDtos.get(0).getBelongCommunityId());
        OrgPo orgPo = BeanConvertUtil.covertBean(businessOrg, OrgPo.class);

        int flag = orgV1InnerServiceSMOImpl.updateOrg(orgPo);

        if (flag < 1) {