诊断程序修改

src/main/java/com/om/entity/vo/DiagnosisVersionSearchVO.java

@@ -19,6 +19,7 @@ public class DiagnosisVersionSearchVO implements Serializable {
     private String diagnosisName;
     private String brandName;
     private String[] clientNames;
+    private String[] clientNum;
     private String[] language;
     private String[] descriptionList;
     private String fileUrl;

src/main/java/com/om/service/impl/DiagnosisVersionInfoServiceImpl.java

@@ -244,6 +244,7 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
             log.info("====diagClients={}", diagClients);
 
             String[] s = new String[diagClients.size()];
+            String[] nums = new String[diagClients.size()];
 
             for (int j = 0; j < diagClients.size(); j++) {
                 Client client = clientService.lambdaQuery()
@@ -252,10 +253,13 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
                 if (BeanUtil.isEmpty(client)){
                     throw new BadReqException("该客户端编号"+diagClients.get(j).getClientNum()+"不存在");
                 }
+                nums[j] = client.getNumber();
                 s[j] = client.getName();
             }
             //传入客户端num
             versionVO.setClientNames(s);
+            versionVO.setClientNum(nums);
+
 
             //传输描述和语言集合
             LambdaQueryWrapper<DiagnosisVersionDescribe> describeQueryWrapper = new LambdaQueryWrapper<>();

src/main/java/com/om/service/impl/UserServiceImpl.java

@@ -561,7 +561,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         Integer userId = guidDTO.getUserId();
         String username = dto.getUsername();
         User user = this.lambdaQuery()
-                .eq(User::getUsername, username)
+                .eq(User::getId, userId)
                 .one();
         if (user == null) {
             return Result.error().message("用户不存在").result(ResultCode.USER_NO_EXIST);

src/main/java/com/om/service/impl/VciInfoServiceImpl.java

@@ -263,10 +263,12 @@ public class VciInfoServiceImpl extends ServiceImpl<VciInfoMapper, VciInfo> impl
             }
         }
 
+        List<Integer> appIds =  appService.lambdaQuery()
+                .apply("CONCAT(',', client_nums, ',') LIKE {0}", "%" + clientNum + "%")
+                .orderByDesc(App::getVersionNum)
+                .list().stream().map(c->c.getId()).collect(Collectors.toList());
+
 
-        List<Integer> appIds = appsClientsService.lambdaQuery()
-                .eq(AppsClients::getClientNum, clientNum)
-                .list().stream().map(c -> c.getAppId()).collect(Collectors.toList());
 
         if (!appIds.isEmpty()){
             List<App> apps = appService.listByIds(appIds);