Merge remote-tracking branch 'origin/master'

common/src/main/java/com/huaxu/model/ResultStatus.java

@@ -103,6 +103,7 @@ public enum ResultStatus {
     EXSIT_IS_PARENT_ERROR(800001,"存在下级信息不能删除"),
 
     SYSTEM_ERROR(999999, "系统错误"),
+    PARAM_ERROR(700001, "参数缺失"),
     ;
 
     private final int status;

user_center/src/main/java/com/huaxu/controller/MenuController.java

@@ -50,6 +50,7 @@ public class MenuController {
         Pagination<MenuEntity> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
+
     @ApiOperation(value = "查询所有菜单")
     @RequestMapping(value = "/selectList", method = RequestMethod.POST)
     public AjaxMessage<List<MenuEntity>> allList(@ApiParam(value = "菜单信息", required = false) @RequestBody MenuEntity menuEntity) {
@@ -64,7 +65,7 @@ public class MenuController {
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public AjaxMessage<Integer> addMenu(@ApiParam(value = "菜单信息", required = true) @RequestBody MenuEntity menu) {
         LoginUser currentUser = UserUtil.getCurrentUser();
-        if(currentUser!=null) {
+        if (currentUser != null) {
             menu.setUpdateBy(currentUser.getUsername());
             menu.setCreateBy(currentUser.getUsername());
             menu.setDateCreate(new Date());
@@ -120,7 +121,7 @@ public class MenuController {
     @RequestMapping(value = "/edit", method = RequestMethod.POST)
     public AjaxMessage<Integer> editMenu(@ApiParam(value = "菜单信息", required = true) @RequestBody MenuEntity menu) {
         LoginUser currentUser = UserUtil.getCurrentUser();
-        if(currentUser!=null) {
+        if (currentUser != null) {
             menu.setUpdateBy(currentUser.getUsername());
             menu.setDateUpdate(new Date());
         }
@@ -134,7 +135,9 @@ public class MenuController {
     @ApiOperation(value = "批量删除菜单")
     @RequestMapping(value = "/deleteByIds", method = RequestMethod.POST)
     public AjaxMessage<Integer> deleteByIds(@ApiParam(value = "菜单IDS", required = true) @RequestBody Long[] ids) {
-
+        if (ids == null || ids.length == 0) {
+            return new AjaxMessage<>(ResultStatus.PARAM_ERROR);
+        }
         List<MenuEntity> menuEntityList = menuService.findMenuByParentIds(ids);
         if (menuEntityList.size() > 0) {
             return new AjaxMessage<>(ResultStatus.EXSIT_IS_PARENT_ERROR, 0);
@@ -150,6 +153,9 @@ public class MenuController {
     @ApiOperation(value = "单个删除菜单")
     @RequestMapping(value = "/deleteById", method = RequestMethod.POST)
     public AjaxMessage<Integer> deleteById(@ApiParam(value = "菜单ID", required = true) @RequestParam Long id) {
+        if (id == null) {
+            return new AjaxMessage<>(ResultStatus.PARAM_ERROR);
+        }
         MenuEntity menuEntity = new MenuEntity();
         menuEntity.setParentMenuId(id);
         List<MenuEntity> menuEntityList = menuService.findList(menuEntity);

user_center/src/main/java/com/huaxu/controller/UserController.java

@@ -53,8 +53,8 @@ public class UserController {
     public  AjaxMessage<Pagination<UserEntity>> list(@RequestParam Integer pageNum, @RequestParam Integer pageSize,@RequestParam(value = "contion",required = false) String contion,@RequestParam(value = "deptId",required = false) Long deptId) {
         IPage<UserEntity> iPage = new Page<>(pageNum, pageSize);
         UserEntity  userEntity = new UserEntity();
-        userEntity.setUsername(contion);
-        userEntity.setPhone(contion);
+        userEntity.setUsername(contion.trim());
+        userEntity.setPhone(contion.trim());
         userEntity.setCompanyOrgId(deptId);
         userEntity.setDeptOrgId(deptId);
         iPage = userService.findPage(iPage, userEntity);

user_center/src/main/resources/application-dev.properties

@@ -65,8 +65,8 @@ spring.kafka.consumer.properties.spring.json.trusted.packages=*
 
 #nacos
 spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
-UMIS.sys_config_path=E:/UMIS_USER_IMAGES/
-UMIS.sys_excel_path=E:/UMIS_USER_EXCEL/
+UMIS.sys_config_path=/UMIS_USER_IMAGES/
+UMIS.sys_excel_path=/UMIS_USER_EXCEL/
 
 
 

user_center/src/main/resources/mapper/UserMapper.xml

@@ -93,7 +93,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                       or a.phone like concat('%', #{user.phone},'%'))
 			</if>
             <if test="user.deptOrgId != null  and user.deptOrgId != ''">
-                 and a.DEPT_ORG_ID = #{user.deptOrgId}
+                 and (a.DEPT_ORG_ID = #{user.deptOrgId}
+                     or a.COMPANY_ORG_ID = #{user.companyOrgId}
+                  )
             </if>
 		</where>
         order by a.date_create desc