diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java index 7b97736..067cf9d 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java @@ -256,7 +256,7 @@ public class UserAddExe { MessageTargetCmd messageTargetCmd = new MessageTargetCmd(); messageTargetCmd.setMobile(phone); messageSendCmd.setTargetCmd(messageTargetCmd); - messageSendCmd.setSourceCode("MS000070"); + messageSendCmd.setSourceCode("MS000087"); Map sendParams = new HashMap(); sendParams.put("code", phoneCode); messageSendCmd.setParams(sendParams); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java index c663da6..ee3dada 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java @@ -90,6 +90,9 @@ public class CorpInfoQueryExe { public CorpInfoCO info(Long id) { CorpInfoDO corpInfoDO = corpInfoRepository.getById(id); + if (corpInfoDO == null){ + throw new BizException("数据不存在"); + } CorpInfoCO corpInfoCO = new CorpInfoCO(); BeanUtils.copyProperties(corpInfoDO, corpInfoCO); diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java index 54fd815..3850da3 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java @@ -49,6 +49,6 @@ public class UserPageQry extends PageQuery { private String menuPath; - + private Integer noMain; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java index 9b05341..586bc32 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java @@ -31,5 +31,6 @@ public class UserQryCmd { private Long departmentId; private Long postId; private String username; + private Integer noMain; } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java index e3d550a..42eb89d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java @@ -77,7 +77,7 @@ public class CorpInfoGatewayImpl implements CorpInfoGateway { @Override public Boolean deletedCorpInfoById(Long id) { - return corpInfoRepository.removeById(id); + return corpInfoRepository.remove(id); } @Override diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java index 8d15aa2..5d13c0a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java @@ -2,6 +2,7 @@ package com.zcloud.basic.info.persistence.repository; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.sun.org.apache.xpath.internal.operations.Bool; import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; import java.util.List; @@ -34,6 +35,8 @@ public interface CorpInfoRepository extends BaseRepository { CorpInfoDO getCorpInfoByCorpName(String corpName); + Boolean remove(Long id); + List getByIdList(List corpinfoIds); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index 9aed7be..c50c7c9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -4,24 +4,21 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jjb.saas.config.client.dicttree.facade.ConfDictTreeFacade; -import com.jjb.saas.config.client.dicttree.response.ConfDictTreeCO; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; -import com.jjb.saas.system.client.tenant.facade.TenantFacade; import com.jjb.saas.system.client.tenanttype.facade.TenantTypeFacade; import com.jjb.saas.system.client.tenanttype.response.TenantTypeCO; import com.jjb.saas.system.client.unit.facade.UnitFacade; import com.jjb.saas.system.client.unit.request.OpeUnitAddCmd; import com.jjb.saas.system.client.unit.request.OpeUnitUpdateCmd; import com.jjb.saas.system.client.user.facade.UserFacade; -import com.jjb.saas.system.client.user.request.UserUpdateCmd; import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.domain.enums.CorpUseFlagEnum; import com.zcloud.basic.info.domain.enums.MenuEnum; @@ -29,7 +26,6 @@ import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; import com.zcloud.basic.info.persistence.mapper.CorpInfoMapper; import com.zcloud.basic.info.persistence.repository.CorpInfoRepository; import com.zcloud.basic.info.utils.Query; -import com.zcloud.gbscommon.utils.MD5; import com.zcloud.gbscommon.utils.PageQueryHelper; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; @@ -61,8 +57,6 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { @@ -212,5 +206,14 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl().eq("id", id); + updateWrapper.set("delete_enum", "TRUE"); + return update(updateWrapper); + + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index 48b1638..106beb6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -17,6 +17,7 @@ import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.jjb.saas.message.client.message.facede.MessageFacade; import com.jjb.saas.message.client.todotask.facade.BusTodoTaskFacade; +import com.jjb.saas.message.client.todotask.request.HandelTaskAddCmd; import com.jjb.saas.system.client.role.facade.RoleFacade; import com.jjb.saas.system.client.role.response.RoleCO; import com.jjb.saas.system.client.user.facade.UserFacade;