--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/hotsw/HotSearchWordController.java

 package com.zrqx.sysuser.bg.controller.hotsw;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
 import java.util.Arrays;
-import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,14 +11,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.entity.Example.Criteria;
-
 import com.zrqx.core.constant.sysuser.SysUserRequestPath;
 import com.zrqx.core.enums.AuditStatusEnum;
-import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.exception.BusinessValidateException;
-import com.zrqx.core.exception.ParameterValidateException;
 import com.zrqx.core.form.sysuser.bg.hotsw.QueryHotSearchWordForm;
 import com.zrqx.core.form.sysuser.bg.hotsw.UpdateHotSearchWordForm;
 import com.zrqx.core.model.sysuser.hotsw.HotSearchWord;
@@ -31,6 +22,11 @@ import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.sysuser.bg.service.hotsw.HotSearchWordService;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.entity.Example.Criteria;
+
 /**
  * 热搜词 Controller
  */
@@ -51,6 +47,7 @@ public class HotSearchWordController {
 		}
 		entity.setAuditStatus(AuditStatusEnum.STATUS_1.getCode());
 		entity.setSearchCount(0);
+		entity.setSort(service.getMaxOrderNum()+1);
 		if(!service.insert(entity)){
 			throw new BusinessValidateException("操作失败");
 		}
@@ -83,36 +80,13 @@ public class HotSearchWordController {
 		}
 		return CallBack.success();
 	}
-	@ApiOperation(value = "批量审核" , notes ="批量审核")
-	@PostMapping(value = SysUserRequestPath.BATCH + "/auditStatus")
-	public CallBack<Boolean> updateArray(@RequestBody Integer[] id){
-		if(id.length == 0){
-			throw new ParameterValidateException(ResponseCodeEnum.MISS_EXCEPTION.getCode(), "没有选中任何数据，请重新选择");
-		}
-		Example example = service.createExample();
-		Criteria cr = example.createCriteria();
-		cr.andIn("hswId", Arrays.asList(id));
-		HotSearchWord hsw = new  HotSearchWord();
-		hsw.setAuditStatus(AuditStatusEnum.STATUS_1.getCode());
-		if(!service.UpdateByExampleSelective(hsw,example)){
-			throw new BusinessValidateException("操作失败");
-		}
-		return CallBack.success();
-	}
 	
-	@ApiOperation(value = "批量 上架/下架" , notes ="批量 上架/下架")
+	@ApiOperation(value = "批量 启用/禁用" , notes ="批量 启用/禁用")
 	@PostMapping(value = SysUserRequestPath.BATCH + "/showState")
 	public CallBack<Boolean> updateShowState(@RequestBody UpdateHotSearchWordForm form){
 		Example example = service.createExample();
 		Criteria cr = example.createCriteria();
 		cr.andIn("hswId", Arrays.asList(form.getIds()));
-		List<HotSearchWord> hList = service.selectByExample(example);
-		for (HotSearchWord hotSearchWord : hList) {
-			if(hotSearchWord.getAuditStatus() == AuditStatusEnum.STATUS_0.getCode()){
-				throw new BusinessValidateException("未审核热搜词不能上架");
-			}
-		}
-		cr.andEqualTo("auditStatus", AuditStatusEnum.STATUS_1.getCode());
 		HotSearchWord hsw = new  HotSearchWord();
 		hsw.setShowState(form.getShowState());
 		if(!service.UpdateByExampleSelective(hsw,example)){
@@ -148,12 +122,6 @@ public class HotSearchWordController {
 		if(StringUtils.isNotBlank(entity.getHotSearchWord())){
 			cr.andLike("hotSearchWord","%"+entity.getHotSearchWord()+"%");
 		}
-		if(entity.getAuditStatus()!=null){
-			cr.andEqualTo("auditStatus",entity.getAuditStatus());
-		}
-		if(entity.getShowState()!=null){
-			cr.andEqualTo("showState",entity.getShowState());
-		}
 		return CallBack.success(service.queryExample(pageParam,example));
 	}
 	@ApiOperation(value = "查询当前最大排序号" , notes ="查询当前最大排序号")

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/modulepower/ModulepowerController.java

 package com.zrqx.sysuser.bg.controller.modulepower;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,9 +12,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.entity.Example.Criteria;
-
 import com.zrqx.core.constant.sysuser.SysUserRequestPath;
 import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.exception.BusinessValidateException;
@@ -32,6 +24,12 @@ import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.sysuser.bg.modulepower.ModulepowerVO;
 import com.zrqx.sysuser.bg.service.modulepower.ModulepowerService;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import tk.mybatis.mapper.entity.Example;
+
 /**
  * 模块权限 Controller
  */