Merge remote-tracking branch 'origin/master'

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/UserApiFallbackFactory.java

@@ -120,6 +120,11 @@ public class UserApiFallbackFactory implements FallbackFactory <IUserApi> {
             }
 
             @Override
+            public UserDTO getByDdIdAndTenantId(String ddId, String tenantId) {
+                return null;
+            }
+
+            @Override
             public String getOpenIdsByIds(String userIds) {
                 return null;
             }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IUserApi.java

@@ -183,6 +183,9 @@ public interface IUserApi {
     @GetMapping(value = BASE_URL + "/getByddId")
     UserDTO getByDdId(@RequestParam("ddId") String ddId);
 
+    @GetMapping(value = BASE_URL + "/getByDdIdAndTenantId")
+    UserDTO getByDdIdAndTenantId(@RequestParam("ddId") String ddId, @RequestParam("tenantId") String tenantId);
+
     /**
      * 根据id获取用户
      *

jeeplus-auth/src/main/java/com/jeeplus/auth/config/DingTalkProperties.java

@@ -0,0 +1,65 @@
+package com.jeeplus.auth.config;
+
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "dingtalk")
+public class DingTalkProperties {
+
+    private String defaultTenantId = "10009";
+
+    private String corpId;
+
+    private String agentId;
+
+    private String appKey;
+
+    private String apiKey;
+
+    private String appSecret;
+
+    private Map<String, TenantConfig> tenants = new HashMap<>();
+
+    public TenantConfig getRequiredConfig(String tenantId) {
+        String resolvedTenantId = StringUtils.defaultIfBlank(tenantId, defaultTenantId);
+        TenantConfig tenantConfig = tenants.get(resolvedTenantId);
+        if (tenantConfig == null && tenants.size() == 1) {
+            tenantConfig = tenants.values().iterator().next();
+        }
+        if (tenantConfig == null && StringUtils.isNotBlank(getResolvedAppKey()) && StringUtils.isNotBlank(appSecret)) {
+            tenantConfig = new TenantConfig();
+            tenantConfig.setCorpId(corpId);
+            tenantConfig.setAgentId(agentId);
+            tenantConfig.setAppKey(getResolvedAppKey());
+            tenantConfig.setAppSecret(appSecret);
+        }
+        if (tenantConfig == null || StringUtils.isBlank(tenantConfig.getResolvedAppKey()) || StringUtils.isBlank(tenantConfig.getAppSecret())) {
+            throw new IllegalStateException("DingTalk config is missing for tenant " + resolvedTenantId);
+        }
+        return tenantConfig;
+    }
+
+    private String getResolvedAppKey() {
+        return StringUtils.defaultIfBlank(appKey, apiKey);
+    }
+
+    @Data
+    public static class TenantConfig {
+        private String corpId;
+        private String agentId;
+        private String appKey;
+        private String apiKey;
+        private String appSecret;
+
+        public String getResolvedAppKey() {
+            return StringUtils.defaultIfBlank(appKey, apiKey);
+        }
+    }
+}

jeeplus-auth/src/main/java/com/jeeplus/auth/controller/LoginController.java

@@ -8,6 +8,7 @@ import cn.hutool.captcha.LineCaptcha;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.jeeplus.auth.model.LoginForm;
+import com.jeeplus.auth.service.DingTalkAuthService;
 import com.jeeplus.common.SecurityUtils;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.common.constant.CacheNames;
@@ -75,6 +76,9 @@ public class LoginController {
     @Autowired
     private RedisUtils redisUtils;
 
+    @Autowired
+    private DingTalkAuthService dingTalkAuthService;
+
 
     @PostMapping("/login")
     @ApiLog(value = "用户登录", type = LogTypeEnum.LOGIN)
@@ -495,5 +499,145 @@ public class LoginController {
 
     }
 
+    /**
+     * 获取钉钉配置
+     */
+    @GetMapping("/sys/dingtalk/clientConfig")
+    @ApiOperation("获取钉钉配置")
+    public ResponseEntity dingTalkClientConfig(@RequestParam(required = false) String tenantId) {
+        String resolvedTenantId = StringUtils.defaultIfBlank(tenantId, "10009");
+        com.jeeplus.auth.config.DingTalkProperties.TenantConfig tenantConfig = dingTalkAuthService.getTenantConfig(resolvedTenantId);
+        return ResponseUtil.newInstance()
+                .add("tenantId", resolvedTenantId)
+                .add("corpId", tenantConfig.getCorpId())
+                .add("agentId", tenantConfig.getAgentId())
+                .ok();
+    }
+
+    /**
+     * 钉钉authCode登录
+     */
+    @PostMapping("/sys/dingtalk/login")
+    @ApiLog(value = "钉钉授权登录", type = LogTypeEnum.LOGIN)
+    @ApiOperation("钉钉授权登录")
+    public ResponseEntity dingTalkAuthCodeLogin(@RequestBody LoginForm loginForm) {
+        String tenantId = StringUtils.defaultIfBlank(loginForm.getTenantId(), "10009");
+        DingTalkAuthService.DingTalkUser dingTalkUser = dingTalkAuthService.getUserByAuthCode(tenantId, loginForm.getAuthCode());
+        UserDTO user = userApi.getByDdIdAndTenantId(dingTalkUser.getUserId(), tenantId);
+        if (user == null) {
+            String bindKey = dingTalkAuthService.createBindKey(tenantId, dingTalkUser.getUserId());
+            return ResponseUtil.newInstance()
+                    .add("bindRequired", true)
+                    .add("bindKey", bindKey)
+                    .add("tenantId", tenantId)
+                    .ok("DingTalk account is not bound");
+        }
+
+        ResponseUtil responseUtil = new ResponseUtil();
+        String loginUserName = user.getLoginName();
+        String username = user.getLoginName();
+        Object redisValue = RedisUtils.getInstance().get(CacheNames.USER_CACHE_LOGIN_CODE + loginUserName);
+        Integer redisLoginNumber = null;
+
+        if (redisValue != null) {
+            redisLoginNumber = Integer.valueOf(redisValue.toString());
+        } else {
+            redisLoginNumber = 0;
+        }
+        if (null == redisLoginNumber) {
+            redisLoginNumber = 0;
+        } else {
+            redisLoginNumber++;
+        }
+        RedisUtils.getInstance().set(CacheNames.USER_CACHE_LOGIN_CODE + loginUserName, redisLoginNumber);
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime midnight = now.toLocalDate().plusDays(1).atStartOfDay();
+        long secondsUntilMidnight = Duration.between(now, midnight).getSeconds();
+        RedisUtils.getInstance().expire(CacheNames.USER_CACHE_LOGIN_CODE + loginUserName, secondsUntilMidnight);
+
+        Integer loginNumber = 5;
+        if (redisLoginNumber >= 10) {
+            return ResponseEntity.badRequest().body(ErrorConstants.LOGIN_MAX_COUNT);
+        }
+        if (redisLoginNumber > loginNumber) {
+            return ResponseEntity.badRequest().body(ErrorConstants.LOGIN_CODE);
+        }
+
+        AuthenticationManager authenticationManager = SpringUtil.getBean(AuthenticationManager.class);
+        SecurityUtils.login(username, "Xg@sys9hB2!xWm", authenticationManager);
+
+        String domain = RequestUtils.getHeader("domain");
+        if (domain != null && domain.contains("ydddl")) {
+
+        } else {
+            if (!userApi.isEnableLogin(tenantId, username)) {
+                throw new DisabledException(ErrorConstants.LOGIN_ERROR_FORBID_LOGGED_IN_ELSEWHERE);
+            }
+        }
+
+        UserDTO userDTO = userApi.getByLoginName(username, tenantId);
+
+        if ("妯婅帀".equals(userDTO.getName())) {
+
+            List<UserDTO> onLineUserList = SpringUtil.getBean(IUserApi.class).getOnLineUserList("榛勭幃", "10002");
+            if (!onLineUserList.isEmpty()) {
+                throw new DisabledException("褰撳墠榛勭幃宸茬櫥褰曠郴缁燂紝" + ErrorConstants.LOGIN_ERROR);
+            }
+        } else if ("榛勭幃".equals(userDTO.getName())) {
+            List<UserDTO> onLineUserList = SpringUtil.getBean(IUserApi.class).getOnLineUserList("妯婅帀", "10002");
+            if (!onLineUserList.isEmpty()) {
+                throw new DisabledException("褰撳墠妯婅帀宸茬櫥褰曠郴缁燂紝" + ErrorConstants.LOGIN_ERROR);
+            }
+        }
+
+        String token = TokenProvider.createAccessToken(username);
+        responseUtil.add(TokenProvider.TOKEN, token);
+        updateUserLoginInfo(responseUtil, userDTO, token);
+
+        RedisUtils.getInstance().delete(CacheNames.USER_CACHE_LOGIN_CODE + loginUserName);
+
+        userDTO.setToken(token);
+        return responseUtil.ok();
+    }
+
+    /**
+     *  将当前的钉钉用户绑定到系统账户，然后登录。
+     */
+    @PostMapping("/sys/dingtalk/bindLogin")
+    @ApiLog(value = "钉钉授权并绑定用户进行登录", type = LogTypeEnum.LOGIN)
+    @ApiOperation("钉钉授权并绑定用户进行登录")
+    public ResponseEntity dingTalkBindLogin(@RequestBody LoginForm loginForm) {
+        DingTalkAuthService.BindInfo bindInfo = dingTalkAuthService.getBindInfo(loginForm.getDingTalkBindKey());
+        String username = loginForm.getUsername();
+        String password = loginForm.getPassword();
+
+        AuthenticationManager authenticationManager = SpringUtil.getBean(AuthenticationManager.class);
+        SecurityUtils.login(username, password, authenticationManager);
+
+        UserDTO userDTO = userApi.getByLoginName(username, bindInfo.getTenantId());
+        if (userDTO == null) {
+            throw new UsernameNotFoundException(ErrorConstants.LOGIN_ERROR_NOTFOUND);
+        }
+        if (CommonConstants.NO.equals(userDTO.getLoginFlag())) {
+            throw new LockedException(ErrorConstants.LOGIN_ERROR_FORBIDDEN);
+        }
+        if (StringUtils.isNotBlank(userDTO.getDdId()) && !bindInfo.getDdId().equals(userDTO.getDdId())) {
+            return ResponseEntity.badRequest().body("Current system account is already bound to another DingTalk account");
+        }
+        UserDTO bindUserDTO = new UserDTO();
+        bindUserDTO.setId(userDTO.getId());
+        bindUserDTO.setDdId(bindInfo.getDdId());
+        userApi.updateUserById(bindUserDTO);
+        userDTO.setDdId(bindInfo.getDdId());
+        userApi.clearCache(userDTO);
+        dingTalkAuthService.removeBindKey(loginForm.getDingTalkBindKey());
+
+        ResponseUtil responseUtil = new ResponseUtil();
+        String token = TokenProvider.createAccessToken(username);
+        responseUtil.add(TokenProvider.TOKEN, token);
+        updateUserLoginInfo(responseUtil, userDTO, token);
+        return responseUtil.ok();
+    }
+
 
 }

jeeplus-auth/src/main/java/com/jeeplus/auth/model/LoginForm.java

@@ -43,4 +43,22 @@ public class LoginForm {
      */
     @ApiModelProperty("用户的钉钉Id")
     private String ddId;
+
+    /**
+     * 钉钉code
+     */
+    @ApiModelProperty("钉钉code")
+    private String authCode;
+
+    /**
+     * tenantId
+     */
+    @ApiModelProperty("tenantId")
+    private String tenantId;
+
+    /**
+     * 钉钉key
+     */
+    @ApiModelProperty("钉钉key")
+    private String dingTalkBindKey;
 }

jeeplus-auth/src/main/java/com/jeeplus/auth/service/DingTalkAuthService.java

@@ -0,0 +1,117 @@
+package com.jeeplus.auth.service;
+
+import cn.hutool.core.util.URLUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.jeeplus.auth.config.DingTalkProperties;
+import com.jeeplus.common.redis.RedisUtils;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.UUID;
+
+@Service
+public class DingTalkAuthService {
+
+    private static final String CACHE_NAME = "dingtalk:auth";
+    private static final String ACCESS_TOKEN_KEY = "accessToken:";
+    private static final String BIND_KEY = "bind:";
+    private static final long ACCESS_TOKEN_EXPIRE_SECONDS = 7000L;
+    private static final long BIND_KEY_EXPIRE_SECONDS = 600L;
+
+    @Autowired
+    private DingTalkProperties dingTalkProperties;
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public DingTalkProperties.TenantConfig getTenantConfig(String tenantId) {
+        return dingTalkProperties.getRequiredConfig(tenantId);
+    }
+
+    public DingTalkUser getUserByAuthCode(String tenantId, String authCode) {
+        if (StringUtils.isBlank(authCode)) {
+            throw new IllegalArgumentException("DingTalk authCode is required");
+        }
+        String accessToken = getAccessToken(tenantId);
+        JSONObject requestBody = JSONUtil.createObj().set("code", authCode);
+        String response = HttpRequest
+                .post("https://oapi.dingtalk.com/topapi/v2/user/getuserinfo?access_token=" + URLUtil.encodeQuery(accessToken))
+                .body(requestBody.toString())
+                .timeout(10000)
+                .execute()
+                .body();
+        JSONObject responseJson = JSONUtil.parseObj(response);
+        Integer errCode = responseJson.getInt("errcode");
+        if (errCode == null || errCode != 0) {
+            throw new IllegalStateException("DingTalk get user info failed: " + responseJson.getStr("errmsg"));
+        }
+        JSONObject result = responseJson.getJSONObject("result");
+        if (result == null || StringUtils.isBlank(result.getStr("userid"))) {
+            throw new IllegalStateException("DingTalk user id is empty");
+        }
+        return new DingTalkUser(result.getStr("userid"), result.getStr("unionid"));
+    }
+
+    public String createBindKey(String tenantId, String ddId) {
+        String bindKey = UUID.randomUUID().toString().replace("-", "");
+        redisUtils.set(CACHE_NAME, BIND_KEY + bindKey, tenantId + "|" + ddId);
+        redisUtils.expire(CACHE_NAME, BIND_KEY + bindKey, BIND_KEY_EXPIRE_SECONDS);
+        return bindKey;
+    }
+
+    public BindInfo getBindInfo(String bindKey) {
+        Object value = redisUtils.get(CACHE_NAME, BIND_KEY + bindKey);
+        if (value == null) {
+            throw new IllegalArgumentException("DingTalk bind key is expired");
+        }
+        String[] parts = value.toString().split("\\|", 2);
+        if (parts.length != 2 || StringUtils.isBlank(parts[0]) || StringUtils.isBlank(parts[1])) {
+            throw new IllegalArgumentException("DingTalk bind key is invalid");
+        }
+        return new BindInfo(parts[0], parts[1]);
+    }
+
+    public void removeBindKey(String bindKey) {
+        redisUtils.delete(CACHE_NAME, BIND_KEY + bindKey);
+    }
+
+    private String getAccessToken(String tenantId) {
+        String cacheKey = ACCESS_TOKEN_KEY + StringUtils.defaultIfBlank(tenantId, dingTalkProperties.getDefaultTenantId());
+        Object cachedToken = redisUtils.get(CACHE_NAME, cacheKey);
+        if (cachedToken != null && StringUtils.isNotBlank(cachedToken.toString())) {
+            return cachedToken.toString();
+        }
+        DingTalkProperties.TenantConfig tenantConfig = dingTalkProperties.getRequiredConfig(tenantId);
+        String url = "https://oapi.dingtalk.com/gettoken?appkey=" + URLUtil.encodeQuery(tenantConfig.getResolvedAppKey())
+                + "&appsecret=" + URLUtil.encodeQuery(tenantConfig.getAppSecret());
+        String response = HttpRequest.get(url).timeout(10000).execute().body();
+        JSONObject responseJson = JSONUtil.parseObj(response);
+        Integer errCode = responseJson.getInt("errcode");
+        if (errCode == null || errCode != 0 || StringUtils.isBlank(responseJson.getStr("access_token"))) {
+            throw new IllegalStateException("DingTalk access token failed: " + responseJson.getStr("errmsg"));
+        }
+        String accessToken = responseJson.getStr("access_token");
+        redisUtils.set(CACHE_NAME, cacheKey, accessToken);
+        redisUtils.expire(CACHE_NAME, cacheKey, ACCESS_TOKEN_EXPIRE_SECONDS);
+        return accessToken;
+    }
+
+    @Data
+    @AllArgsConstructor
+    public static class DingTalkUser {
+        private String userId;
+        private String unionId;
+    }
+
+    @Data
+    @AllArgsConstructor
+    public static class BindInfo {
+        private String tenantId;
+        private String ddId;
+    }
+}

jeeplus-common/jeeplus-common-mybatis-plus/src/main/java/com/jeeplus/config/TenantLineHandlerImpl.java

@@ -81,6 +81,7 @@ public class TenantLineHandlerImpl implements TenantLineHandler {
                 || (tableName.startsWith ( "knowledge_" ))
                 || (tableName.startsWith ( "lucky_" ))
                 || (tableName.startsWith ( "material_" ))
+                || (tableName.startsWith ( "psi_" ))
                 || (tableName.startsWith ( "position_" ))
                 || (tableName.startsWith ( "project_" ))
                 || (tableName.startsWith ( "proofread_" ))

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowProcessService.java

@@ -21,9 +21,12 @@ import com.jeeplus.flowable.vo.ProcessStatus;
 import com.jeeplus.flowable.vo.ProcessVo;
 import com.jeeplus.flowable.vo.TaskVo;
 import com.jeeplus.sys.feign.IOfficeApi;
+import com.jeeplus.sys.feign.IRoleApi;
 import com.jeeplus.sys.feign.ITenantApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.OfficeDTO;
+import com.jeeplus.sys.service.dto.RoleDTO;
+import com.jeeplus.sys.service.dto.TenantDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
@@ -148,8 +151,31 @@ public class FlowProcessService {
 
         if (StringUtils.isNotBlank(type)) {
             if (type.equals("ydd")) {
+                IUserApi userApi = SpringUtil.getBean(IUserApi.class);
+                UserDTO currentUser = userApi.getByToken(TokenProvider.getCurrentToken());
+                List<String> requiredNames;
+                if(currentUser != null){
+                    TenantDTO tenantDTO = currentUser.getTenantDTO();
+                    if(tenantDTO != null && tenantDTO.getId().equals("10009")){
+                        IRoleApi roleApi = SpringUtil.getBean(IRoleApi.class);
+                        // 只要有一个角色是“老板”，就返回true
+                        boolean isBoss = currentUser.getRoleDTOList().stream()
+                                .map(RoleDTO::getId)
+                                .map(roleApi::getRoleDTOByIdForApp)
+                                .filter(Objects::nonNull) // 过滤查询失败的null角色
+                                .anyMatch(role -> "老板".equals(role.getName())); // 防空指针
+                        if (isBoss) {
+                            requiredNames = Arrays.asList("进销存-领用申请");
+                        }else{
+                            requiredNames = Arrays.asList("");
+                        }
+                    }else{
+                        requiredNames = Arrays.asList("物资管理-领用申请", "物资管理-采购申请", "日常办公-请假申请", "离职申请", "离职交接申请", "会计-报销审批", "会计-报销审批-电子发票", "会计-发票申请", "报销申请", "发票申请","会议室预约");
+                    }
+                }else{
+                    requiredNames = Arrays.asList("物资管理-领用申请", "物资管理-采购申请", "日常办公-请假申请", "离职申请", "离职交接申请", "会计-报销审批", "会计-报销审批-电子发票", "会计-发票申请", "报销申请", "发票申请","会议室预约");
+                }
                 // 创建一个包含需要保留的流程定义名称的集合
-                List<String> requiredNames = Arrays.asList("物资管理-领用申请", "物资管理-采购申请", "日常办公-请假申请", "离职申请", "离职交接申请", "会计-报销审批", "会计-报销审批-电子发票", "会计-发票申请", "报销申请", "发票申请","会议室预约");
                 /**
                  * 移动端工作台数据处理
                  */

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/psiWareHouse/service/PsiWareHouseBasicService.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,6 +13,10 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.flowable.feign.IFlowableApi;
+import com.jeeplus.psimanage.collect.domain.PsiCollectDetailed;
+import com.jeeplus.psimanage.collect.domain.PsiCollectDetailedRecord;
+import com.jeeplus.psimanage.collect.mapper.PsiCollectDetailedMapper;
+import com.jeeplus.psimanage.collect.mapper.PsiCollectDetailedRecordMapper;
 import com.jeeplus.psimanage.psiWareHouse.service.dto.PsiWareSummaryExportDto;
 import com.jeeplus.psimanage.purchase.domain.PsiMaterialBasic;
 import com.jeeplus.psimanage.purchase.domain.PsiMaterialDetailed;
@@ -102,6 +107,12 @@ public class PsiWareHouseBasicService {
     @Resource
     private PsiMaterialSupplierMapper psiMaterialSupplierMapper;
 
+    @Resource
+    private PsiCollectDetailedRecordMapper psiCollectDetailedRecordMapper;
+
+    @Resource
+    private PsiCollectDetailedMapper psiCollectDetailedMapper;
+
     /**
      * 列表查询
      */
@@ -377,7 +388,7 @@ public class PsiWareHouseBasicService {
                 // 入库详情修改
                 List<PsiWareHouseDetailed> wareHouseDetaileds = psiDetailedMapper.selectList(new LambdaQueryWrapper<PsiWareHouseDetailed>()
                         .eq(PsiWareHouseDetailed::getBasicId,info.getId()));
-                wareHouseDetaileds.stream().forEach(item -> {
+                wareHouseDetaileds.forEach(item -> {
                     if ("1".equals(item.getUpFlag()) || "2".equals(item.getUpFlag())) { // 将修改前的数据以及删除标记的数据删除
                         psiDetailedMapper.deleteById(item.getId());
                     } else if ("0".equals(item.getUpFlag())) {
@@ -385,6 +396,26 @@ public class PsiWareHouseBasicService {
                             psiDetailedMapper.upSourceIdEmpty(item.getId()); // 根据入库详情id置空sourceId
                         }
                     }
+                    //调整库存对应的入库类型
+                    List<PsiCollectDetailedRecord> recordList = psiCollectDetailedRecordMapper.selectList(
+                            new LambdaQueryWrapper<PsiCollectDetailedRecord>()
+                                    .eq(PsiCollectDetailedRecord::getInventoryId, item.getId())
+                                    .eq(PsiCollectDetailedRecord::getDelFlag,"0")
+                    );
+                    for (PsiCollectDetailedRecord psiCollectDetailedRecord : recordList) {
+                        if(!psiCollectDetailedRecord.getCollectType().equals(item.getWareHouseType())){
+                            psiCollectDetailedRecordMapper.update(
+                                    null,
+                                    new LambdaUpdateWrapper<PsiCollectDetailedRecord>()
+                                            .eq(PsiCollectDetailedRecord::getId, psiCollectDetailedRecord.getId())
+                                            .set(PsiCollectDetailedRecord::getCollectType, item.getWareHouseType()));
+                            psiCollectDetailedMapper.update( null,
+                                    new LambdaUpdateWrapper<PsiCollectDetailed>()
+                                            .eq(PsiCollectDetailed::getId, psiCollectDetailedRecord.getDetailId())
+                                            .set(PsiCollectDetailed::getCollectType, item.getWareHouseType()));
+
+                        }
+                    }
                 });
                 return dto.getId();
             }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/app/AppUserController.java

@@ -13,6 +13,7 @@ import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.OfficeService;
 import com.jeeplus.sys.service.UserService;
+import com.jeeplus.sys.service.dto.TenantDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +51,23 @@ public class AppUserController extends UserController {
     @GetMapping("treeData")
     public ResponseEntity treeData() {
         List <Office> list = officeService.list ( );
+        // 通过用户名从数据库获取用户信息
+        IUserApi userApi = SpringUtil.getBean(IUserApi.class);
+        UserDTO userDTO = userApi.getByToken(TokenProvider.getCurrentToken());
         List rootTree = getRootTree ( list );
+        TenantDTO tenantDTO = userDTO.getTenantDTO();
+        if(tenantDTO != null){
+            String tenantId = tenantDTO.getId();
+            if(tenantId.equals("10009")){
+                rootTree = (List) rootTree.stream()
+                        .filter(item -> {
+                            Map map = (Map) item;
+                            Object label = map.get("label");
+                            return label != null && label.toString().equals("景聚庭");
+                        })
+                        .collect(Collectors.toList());
+            }
+        }
         return ResponseEntity.ok ( rootTree );
     }
 

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/feign/UserApiImpl.java

@@ -144,6 +144,11 @@ public class UserApiImpl implements IUserApi {
     }
 
     @Override
+    public UserDTO getByDdIdAndTenantId(String ddId, String tenantId) {
+        return userService.getByDdIdAndTenantId(ddId, tenantId);
+    }
+
+    @Override
     public String getOpenIdsByIds(String userIds) {
         // 使用逗号分隔字符串并转换为数组
         String[] usersArray = userIds.split(",");

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -44,6 +44,9 @@ public interface UserMapper extends BaseMapper <User> {
 
     @InterceptorIgnore(tenantLine = "true")
     UserDTO getByDdId(@Param("ddId") String ddId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    UserDTO getByDdIdAndTenantId(@Param("ddId") String ddId, @Param("tenantId") String tenantId);
     /**
      * 获取岗位列表
      *

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -739,6 +739,11 @@ select a.id, a.company_id as "companyDTO.id", a.office_id as "officeDTO.id", a.l
             login_name, password
         FROM sys_user a where dd_id = #{ddId}
     </select>
+    <select id="getByDdIdAndTenantId" resultType="com.jeeplus.sys.service.dto.UserDTO">
+        SELECT
+            login_name, password
+        FROM sys_user a where dd_id = #{ddId} and tenant_id = #{tenantId} and del_flag = '0'
+    </select>
     <select id="getAllOpenIds" resultType="java.lang.String">
         SELECT open_id FROM sys_user WHERE del_flag = 0 and open_id is not null
     </select>

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -90,6 +90,10 @@ public class UserService extends ServiceImpl<UserMapper, User> {
         return baseMapper.getByDdId(ddId);
     }
 
+    public UserDTO getByDdIdAndTenantId(String ddId, String tenantId) {
+        return baseMapper.getByDdIdAndTenantId(ddId, tenantId);
+    }
+
     public List<String> getAllOpenIds() {
         return baseMapper.getAllOpenIds();
     }