--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/ad/AdspaceController.java

@@ -15,9 +15,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.zrqx.core.constant.sysuser.SysUserRequestPath;
 import com.zrqx.core.enums.ResponseCodeEnum;
+import com.zrqx.core.enums.sysuser.ad.AdStatusEnum;
 import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.exception.ParameterValidateException;
 import com.zrqx.core.form.sysuser.bg.ad.QueryAdspaceForm;
+import com.zrqx.core.form.sysuser.bg.ad.UpdateAdsignForm;
+import com.zrqx.core.model.sysuser.ad.Adsign;
 import com.zrqx.core.model.sysuser.ad.Adspace;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
@@ -89,6 +92,22 @@ public class AdspaceController {
 		}
 		return CallBack.success();
 	}
+	
+	@ApiOperation(value = "批量设置状态", notes = "批量设置状态")
+	@PostMapping(value = SysUserRequestPath.BATCH_UPDATE)
+	public CallBack<Boolean> updateStatusById(@RequestBody UpdateAdsignForm form) {
+		if (form.getIds().length == AdStatusEnum.STATUS_0.getCode()) {
+			throw new ParameterValidateException(ResponseCodeEnum.MISS_EXCEPTION.getCode(), "请选择要修改的数据");
+		}
+		Example example = adspaceService.createExample();
+		example.createCriteria().andIn("id", Arrays.asList(form.getIds()));
+		Adspace adspace = new Adspace();
+		adspace.setStatus(form.getStatus());
+		if(!adspaceService.UpdateByExampleSelective(adspace,example)){
+			throw new BusinessValidateException("操作失败");
+		}
+		return CallBack.success();
+	}
 	@ApiOperation(value = "查询当前最大排序号" , notes ="查询当前最大排序号")
 	@RequestMapping(value = SysUserRequestPath.MAXORDERNUM, method = RequestMethod.GET)
 	public CallBack<Integer> getMaxOrderNum(Integer adsignId){

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/correction/CorrectionController.java

@@ -111,7 +111,13 @@ public class CorrectionController {
 		Example example = service.createExample();
 		Criteria cr = example.createCriteria();
 		if (StringUtils.isNotBlank(form.getTitle())) {
-			cr.andLike("title", "%" + form.getTitle() + "%");
+			cr.orLike("title", "%" + form.getTitle() + "%");
+		}
+		if (StringUtils.isNotBlank(form.getTitle())) {
+			cr.orLike("content", "%" + form.getTitle() + "%");
+		}
+		if (StringUtils.isNotBlank(form.getTitle())) {
+			cr.orLike("periodical", "%" + form.getTitle() + "%");
 		}
 		if (form.getStatus() != null) {
 			cr.andEqualTo("status", form.getStatus());

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/commons/config/WebAppConfig.java

@@ -31,7 +31,7 @@ import com.zrqx.sysuser.commons.interceptor.InterceptorConfig;
  * @author lpf
  * @date 2018年7月24日下午8:01:05
  */
-@Configuration
+//@Configuration
 public class WebAppConfig extends WebMvcConfigurerAdapter {
 
 	/**

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/commons/interceptor/LogAspect.java

@@ -19,8 +19,8 @@ import com.zrqx.core.util.response.CallBack;
 import com.zrqx.sysuser.bg.service.log.LogService;
 import com.zrqx.sysuser.commons.redis.Redis;
 
-@Aspect
-@Component
+//@Aspect
+//@Component
 public class LogAspect {
 	@Autowired 
 	private LogService logService;

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/errorcorrect/FgErrorCorrectServiceImpl.java

@@ -29,12 +29,12 @@ public class FgErrorCorrectServiceImpl extends BaseServiceImpl<Correction, Integ
 
 	@Override
 	public Integer saveErrorCorrect(Correction ec) {
-		if(!fgRedisManage.isExistMember()){
-			throw new LoginValidateException();
-		}
+//		if(!fgRedisManage.isExistMember()){
+//			throw new LoginValidateException();
+//		}
 		ec.setCreateTime(new Date());
 		ec.setCommitTime(new Date());
-		ec.setName(fgRedisManage.getMember().getAccount());
+//		ec.setName(fgRedisManage.getMember().getAccount());
 		ec.setStatus(CorrectionEnum.NOT_REVIEW.getCode());
 		if(insert(ec)){
 			return 1;