Jelajahi Sumber

合并代码

syh 4 tahun lalu
induk
melakukan
86f5d88252

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ads/controller/KuaishouStrategyController.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.ads.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import cn.com.ctop.kuaishou.modules.ai.service.IAiStrategyService;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouStrategy;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouStrategyService;

+ 133 - 128
jeecg-boot-module-system/src/main/java/org/jeecg/modules/append/xd_schedule/controller/XdScheduleController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.append.xd_schedule.controller;
 
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,149 +20,153 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 
- /**
+/**
  * @Description: 时间表
  * @Author: jeecg-boot
- * @Date:   2019-10-29
+ * @Date: 2019-10-29
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="时间表")
+@Api(tags = "时间表")
 @RestController
 @RequestMapping("/xd_schedule/xdSchedule")
 public class XdScheduleController extends JeecgController<XdSchedule, IXdScheduleService> {
-	@Autowired
-	private XdScheduleServiceImpl xdScheduleService;
+    @Autowired
+    private XdScheduleServiceImpl xdScheduleService;
 
-	/**
-	 * 分页列表查询
-	 *
-	 * @param xdSchedule
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@ApiOperation(value="时间表-分页列表查询", notes="时间表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<?> queryPageList(XdSchedule xdSchedule,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<XdSchedule> queryWrapper = QueryGenerator.initQueryWrapper(xdSchedule, req.getParameterMap());
-		Page<XdSchedule> page = new Page<XdSchedule>(pageNo, pageSize);
-		queryWrapper.orderByAsc("DAY");
-		IPage<XdSchedule> pageList = xdScheduleService.page(page, queryWrapper);
-		return Result.ok(pageList);
-	}
+    /**
+     * 分页列表查询
+     *
+     * @param xdSchedule
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @ApiOperation(value = "时间表-分页列表查询", notes = "时间表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<?> queryPageList(XdSchedule xdSchedule,
+                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest req) {
+        QueryWrapper<XdSchedule> queryWrapper = QueryGenerator.initQueryWrapper(xdSchedule, req.getParameterMap());
+        Page<XdSchedule> page = new Page<XdSchedule>(pageNo, pageSize);
+        queryWrapper.orderByAsc("DAY");
+        IPage<XdSchedule> pageList = xdScheduleService.page(page, queryWrapper);
+        return Result.ok(pageList);
+    }
 
-	/**
-	 * 添加
-	 *
-	 * @param xdSchedule
-	 * @return
-	 */
-	@ApiOperation(value="时间表-添加", notes="时间表-添加")
-	@PostMapping(value = "/add")
-	public Result<?> add(@RequestBody XdSchedule xdSchedule) {
-		xdScheduleService.save(xdSchedule);
-		return Result.ok("添加成功!");
-	}
+    /**
+     * 添加
+     *
+     * @param xdSchedule
+     * @return
+     */
+    @ApiOperation(value = "时间表-添加", notes = "时间表-添加")
+    @PostMapping(value = "/add")
+    public Result<?> add(@RequestBody XdSchedule xdSchedule) {
+        xdScheduleService.save(xdSchedule);
+        return Result.ok("添加成功!");
+    }
 
-	/**
-	 * 编辑
-	 *
-	 * @param xdSchedule
-	 * @return
-	 */
-	@ApiOperation(value="时间表-编辑", notes="时间表-编辑")
-	@PutMapping(value = "/edit")
-	public Result<?> edit(@RequestBody XdSchedule xdSchedule) {
-		xdScheduleService.updateById(xdSchedule);
-		return Result.ok("编辑成功!");
-	}
+    /**
+     * 编辑
+     *
+     * @param xdSchedule
+     * @return
+     */
+    @ApiOperation(value = "时间表-编辑", notes = "时间表-编辑")
+    @PutMapping(value = "/edit")
+    public Result<?> edit(@RequestBody XdSchedule xdSchedule) {
+        xdScheduleService.updateById(xdSchedule);
+        return Result.ok("编辑成功!");
+    }
 
-	/**
-	 * 通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@ApiOperation(value="时间表-通过id删除", notes="时间表-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		xdScheduleService.removeById(id);
-		return Result.ok("删除成功!");
-	}
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "时间表-通过id删除", notes = "时间表-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        xdScheduleService.removeById(id);
+        return Result.ok("删除成功!");
+    }
 
-	/**
-	 * 批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@ApiOperation(value="时间表-批量删除", notes="时间表-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.xdScheduleService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.ok("批量删除成功!");
-	}
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @ApiOperation(value = "时间表-批量删除", notes = "时间表-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.xdScheduleService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.ok("批量删除成功!");
+    }
 
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	@ApiOperation(value="时间表-通过id查询", notes="时间表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
-		XdSchedule xdSchedule = xdScheduleService.getById(id);
-		return Result.ok(xdSchedule);
-	}
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "时间表-通过id查询", notes = "时间表-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+        XdSchedule xdSchedule = xdScheduleService.getById(id);
+        return Result.ok(xdSchedule);
+    }
 
-  /**
-   * 导出excel
-   *
-   * @param request
-   * @param xdSchedule
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, XdSchedule xdSchedule) {
-      return super.exportXls(request, xdSchedule, XdSchedule.class, "时间表");
-  }
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param xdSchedule
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, XdSchedule xdSchedule) {
+        return super.exportXls(request, xdSchedule, XdSchedule.class, "时间表");
+    }
 
-  /**
-   * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      return super.importExcel(request, response, XdSchedule.class);
-  }
-  /**
-   * 获取时间范围
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/getDateRange")
-  public Result<?> getDateRange(HttpServletRequest request, HttpServletResponse response) {
-	  String weeknum = request.getParameter("weeknum");
-	  String dateRange = xdScheduleService.getDateRange(weeknum, "yyyy/MM/dd", "--");
-	  return Result.ok(dateRange);
-  }
-  /**通过api同步国家法定节假日*/
-  @RequestMapping(value = "/aotuData")
-  public Result<?> aotuData(HttpServletRequest request, HttpServletResponse response) {
-	  String yyyy = request.getParameter("yyyy");
-	  String body = request.getParameter("body");
-	  xdScheduleService.aotuData(yyyy,body);
-	  return Result.ok();
-  }
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, XdSchedule.class);
+    }
+
+    /**
+     * 获取时间范围
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/getDateRange")
+    public Result<?> getDateRange(HttpServletRequest request, HttpServletResponse response) {
+        String weeknum = request.getParameter("weeknum");
+        String dateRange = xdScheduleService.getDateRange(weeknum, "yyyy/MM/dd", "--");
+        return Result.ok(dateRange);
+    }
+
+    /**
+     * 通过api同步国家法定节假日
+     */
+    @RequestMapping(value = "/aotuData")
+    public Result<?> aotuData(HttpServletRequest request, HttpServletResponse response) {
+        String yyyy = request.getParameter("yyyy");
+        String body = request.getParameter("body");
+        xdScheduleService.aotuData(yyyy, body);
+        return Result.ok();
+    }
 
 }

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdCoverController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import cn.com.ctop.crawler.modules.account.entity.KuaishouAdAccount;
 import cn.com.ctop.crawler.modules.account.service.IKuaishouAdAccountService;
 import cn.com.ctop.kuaishou.modules.app.entity.AppAd;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java

@@ -7,6 +7,7 @@ import cn.com.ctop.common.module.mapper.UserAllocationMapper;
 import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import cn.com.ctop.common.module.utils.StringUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

+ 2 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceMusicInfoController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.module.service.IFileInfoService;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import cn.com.ctop.crawler.modules.music.entity.BytedanceMusicInfo;
 import cn.com.ctop.crawler.modules.music.service.IBytedanceMusicInfoService;
 import com.alibaba.fastjson.JSONObject;
@@ -51,7 +52,7 @@ public class BytedanceMusicInfoController {
         response.setCharacterEncoding("UTF-8");
         fileName = URLEncoder.encode(fileName, "UTF-8");
         response.addHeader("Content-Disposition", "attachment;filename=" + fileName);
-        response.addHeader("Content-Length", file.length()+ "");
+        response.addHeader("Content-Length", file.length() + "");
         OutputStream toClient = new BufferedOutputStream(response.getOutputStream());
         response.setContentType("audio/mp3");
         toClient.write(buffer);

+ 10 - 19
jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java

@@ -1,15 +1,8 @@
 package org.jeecg.modules.demo.test.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.annotation.PermissionData;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,24 +12,22 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.ads.controller.JeecgController;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.RedisUtil;
+import org.jeecg.modules.ads.controller.JeecgController;
 import org.jeecg.modules.demo.test.entity.JeecgDemo;
 import org.jeecg.modules.demo.test.service.IJeecgDemoService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @Description: 单表示例
  * @Author: jeecg-boot

+ 13 - 23
jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java

@@ -1,17 +1,14 @@
 package org.jeecg.modules.demo.test.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import cn.com.ctop.common.module.utils.QueryGenerator;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.ads.controller.JeecgController;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.ads.controller.JeecgController;
 import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer;
 import org.jeecg.modules.demo.test.entity.JeecgOrderMain;
 import org.jeecg.modules.demo.test.entity.JeecgOrderTicket;
@@ -26,24 +23,17 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 一对多示例(JEditableTable行编辑)

+ 8 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderTabMainController.java

@@ -1,9 +1,10 @@
 package org.jeecg.modules.demo.test.controller;
 
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-
+import cn.com.ctop.common.module.utils.QueryGenerator;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer;
 import org.jeecg.modules.demo.test.entity.JeecgOrderMain;
@@ -14,20 +15,10 @@ import org.jeecg.modules.demo.test.service.IJeecgOrderTicketService;
 import org.jeecg.modules.demo.test.vo.JeecgOrderMainPage;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 /**
  * @Description: 一对多示例(ERP TAB风格)

+ 15 - 25
jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java

@@ -1,15 +1,11 @@
 package org.jeecg.modules.demo.test.controller;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import cn.com.ctop.common.module.utils.QueryGenerator;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.demo.test.entity.JoaDemo;
@@ -20,25 +16,19 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
  /**
  * @Description: 流程测试

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.demo.test.service.impl;
 
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 4 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -9,6 +9,7 @@ import cn.com.ctop.common.module.model.SysUserDepartsVO;
 import cn.com.ctop.common.module.model.SysUserSysDepartModel;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
 import cn.com.ctop.common.module.vo.SysDepartUsersVO;
@@ -30,7 +31,6 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
-import cn.com.ctop.common.module.service.ISysBaseApi;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.PasswordUtil;
@@ -39,7 +39,9 @@ import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.ProjectMember;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
-import org.jeecg.modules.system.service.*;
+import org.jeecg.modules.system.service.ISysDepartRoleUserService;
+import org.jeecg.modules.system.service.ISysRoleService;
+import org.jeecg.modules.system.service.ISysUserRoleService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.system.service.impl;
 
 import cn.com.ctop.common.module.entity.SysPermission;
 import cn.com.ctop.common.module.mapper.SysPermissionMapper;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;