修改车辆标签

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java

@@ -47,4 +47,9 @@ public class AppUserManageDTO {
 
     private Long registrationTimeEnd;
 
+    /**
+     * 用户来源:0-自来,1-用户邀请
+     */
+    private Integer source;
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java

@@ -39,11 +39,11 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
      * @param appUserManageDTO 查询条件
      * @return
      */
-    public List<AppUserManageVo> findAllByQuery(AppUserManageDTO appUserManageDTO) {
+    public PageInfo<AppUserManageVo> findAllByQuery(AppUserManageDTO appUserManageDTO) {
         Page<AppUserManageVo> page = PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
         List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO);
 
-        return PageInfo.of(appUserManageVos).getList();
+        return PageInfo.of(appUserManageVos);
     }
 
     /**

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

@@ -26,7 +26,7 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
      * @return
      */
     @PostMapping("/findAll")
-    public ObjectRestResponse<List<AppUserManageVo>> findAllByQuery(@RequestBody AppUserManageDTO appUserManageDTO){
+    public ObjectRestResponse<PageInfo<AppUserManageVo>> findAllByQuery(@RequestBody AppUserManageDTO appUserManageDTO){
         return ObjectRestResponse.succ(baseBiz.findAllByQuery(appUserManageDTO));
     }
 

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -44,7 +44,12 @@
     <select id="selectAppUserManage" parameterType="com.github.wxiaoqi.security.admin.dto.AppUserManageDTO"
             resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo">
         select
-        d.userid,
+        l.id As userid,
+        l.username,
+        l.certification_status,
+        l.id_number,
+        l.createtime,
+        l.last_time,
         d.channel,
         d.is_member,
         d.realname,
@@ -56,11 +61,6 @@
         d.city_code,
         d.sex,
         d.email,
-        l.username,
-        l.certification_status,
-        l.id_number,
-        l.createtime,
-        l.last_time,
         m.member_level,
         m.valid_time,
         m.buy_count,
@@ -122,7 +122,10 @@
         <if test="registrationTimeEnd !=null">
             and l.createtime &lt;= #{registrationTimeEnd}
         </if>
-
+        <if test="source !=null">
+            and d.source &lt;= #{source}
+        </if>
+        order by  l.id  ASC
 
     </select>
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePlatCataBiz.java

@@ -358,7 +358,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
                 //判断子标签是更新还是新增
                 if (VehiclePlatCata.getId() == null || VehiclePlatCata.getId() == 0) {
                     VehiclePlatCata.setUpdTime(System.currentTimeMillis());
-                    VehiclePlatCata.setParentId(parentVPC.getParentId());
+                    VehiclePlatCata.setParentId(parentVPC.getId());
                     //添加
                     insertSelective(VehiclePlatCata);
                 } else {