消息修改

jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.util.encryption.AesEncryptUtil;
@@ -15,6 +16,7 @@ import com.jero.modules.message.entity.SysMessageTemplate;
 import com.jero.modules.message.service.ISysMessageTemplateService;
 import com.jero.modules.message.util.PushMsgUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -55,6 +57,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
 	 * @param req
 	 * @return
 	 */
+	@RequiresPermissions("template:list")
 	@GetMapping(value = "/page")
 	public Result<?> queryPageList(SysMessageTemplate sysMessageTemplate, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
 			@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
@@ -90,6 +93,8 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
 	 * @param sysMessageTemplate
 	 * @return
 	 */
+	@RequiresPermissions("template:edit")
+	@AutoLog(value = "模板管理-编辑")
 	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody SysMessageTemplate sysMessageTemplate) {
 		try {

jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java

@@ -5,6 +5,7 @@ import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.jero.common.aspect.annotation.AutoLog;
 import org.apache.shiro.SecurityUtils;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.CommonConstant;
@@ -13,6 +14,7 @@ import com.jero.common.util.oConvertUtils;
 import com.jero.modules.system.entity.SysAnnouncementSend;
 import com.jero.modules.system.model.AnnouncementSendModel;
 import com.jero.modules.system.service.ISysAnnouncementSendService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -183,6 +185,8 @@ public class SysAnnouncementSendController {
 	 * @param json
 	 * @return
 	 */
+	@RequiresPermissions("message:read")
+	@AutoLog(value = "我的消息-已读")
 	@PostMapping(value = "/editByAnntIdAndUserId")
 	public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
 		Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
@@ -203,6 +207,7 @@ public class SysAnnouncementSendController {
 	 * @功能：获取我的消息
 	 * @return
 	 */
+	@RequiresPermissions("messge:list")
 	@GetMapping(value = "/getMyAnnouncementSend")
 	public Result<IPage<AnnouncementSendModel>> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel,
 			@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,

jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml

@@ -62,6 +62,12 @@
         <if test="announcementSendModel.msgCategory !=null and announcementSendModel.msgCategory != ''">
             and sa.msg_category = #{announcementSendModel.msgCategory}
         </if>
+        <if test="announcementSendModel.startTime != null and announcementSendModel.startTime != ''">
+			and DATE_FORMAT(sa.create_time,'%Y-%m-%d') >= #{announcementSendModel.startTime}
+		</if>
+		<if test="announcementSendModel.endTime != null and announcementSendModel.endTime != ''">
+			and DATE_FORMAT(sa.create_time,'%Y-%m-%d') &lt;= #{announcementSendModel.endTime}
+		</if>
 	   order by sas.read_flag,sa.send_time desc
 	</select>
 

jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java

@@ -83,5 +83,12 @@ public class AnnouncementSendModel implements Serializable {
 	 * 模板编码
 	 */
 	private java.lang.String templateCode;
-
+	/**
+	 * 开始时间
+	 */
+	private String startTime;
+	/**
+	 * 结束时间
+	 */
+	private String endTime;
 }

jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java

@@ -534,6 +534,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			throw new JeroBootException("角色不存在！");
 		}
 		List<String> listRoleId = listSysRole.stream().map(SysRole::getId).collect(Collectors.toList());
+		if(CollectionUtils.isEmpty(listRoleId)){
+			throw new JeroBootException("角色不存在！");
+		}
 		LambdaQueryWrapper<SysUserRole> querySysUserRole = new LambdaQueryWrapper<>();
 		querySysUserRole.in(SysUserRole::getRoleId,listRoleId);
 		List<SysUserRole> listSysUserRole = sysUserRoleMapper.selectList(querySysUserRole);
@@ -541,6 +544,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			return null;
 		}
 		List<String> listUserId = listSysUserRole.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
+		if(CollectionUtils.isEmpty(listUserId)){
+			return null;
+		}
 		LambdaQueryWrapper<SysUser> querySysUser = new LambdaQueryWrapper<>();
 		querySysUser.in(SysUser::getId,listUserId);
 		List<SysUser> listSysUser = userMapper.selectList(querySysUser);