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

订单查询部门和人员是可以关联查询
首次注册随机名称改为汉字

liangpeile 1 год назад
Родитель
Сommit
6e9bfb0ad9

+ 5 - 2
crmeb-front/src/main/java/com/zbkj/front/controller/NewFrontApi.java

@@ -211,11 +211,14 @@ public class NewFrontApi {
                                                                        @ModelAttribute PageParamRequest pageRequest) {
         LambdaQueryWrapper<UserBypassAccount> queryWrapper2 = new LambdaQueryWrapper<>();
         queryWrapper2.eq( UserBypassAccount::getEnterpriseId, id );
+
         if (!department.equals( "" )) {
-            queryWrapper2.eq( UserBypassAccount::getDepartment, department );
+            String[] departments = department.split(",");
+            queryWrapper2.in( UserBypassAccount::getDepartment, departments );
         }
         if (!name.equals( "" )) {
-            queryWrapper2.eq( UserBypassAccount::getRealName, name );
+            String[] names = name.split(",");
+            queryWrapper2.in( UserBypassAccount::getRealName, names );
         }
         List<UserBypassAccount> list = userBypassAccountService.list( queryWrapper2 );
 

+ 1 - 1
crmeb-front/src/main/java/com/zbkj/front/service/impl/LoginServiceImpl.java

@@ -264,7 +264,7 @@ public class LoginServiceImpl implements LoginService {
             user.setAccount(request.getPhone());
             user.setSpreadUid(0);
             user.setPwd(CommonUtil.createPwd(request.getPhone()));
-            user.setNickname(CommonUtil.createNickName(request.getPhone()));
+            user.setNickname("贵彩办公");
             user.setAvatar(systemConfigService.getValueByKey(SysConfigConstants.USER_DEFAULT_AVATAR_CONFIG_KEY));
             user.setSex(0);
             user.setAddress("");