Merge remote-tracking branch 'origin/master'

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/CdEnterpriseEnnouncementController.java

@@ -74,7 +74,7 @@ public class CdEnterpriseEnnouncementController extends JeecgController<CdEnterp
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		queryWrapper.lambda().eq(CdEnterpriseEnnouncement::getPkOrg,sysUser.getOrgCode());
 		queryWrapper.lambda().eq(CdEnterpriseEnnouncement::getDelFlag,'0');
-		queryWrapper.lambda().orderByDesc(CdEnterpriseEnnouncement::getCreateTime);
+		queryWrapper.lambda().orderByDesc(CdEnterpriseEnnouncement::getUpdateTime);
 		Page<CdEnterpriseEnnouncement> page = new Page<CdEnterpriseEnnouncement>(pageNo, pageSize);
 		IPage<CdEnterpriseEnnouncement> pageList = cdEnterpriseEnnouncementService.page(page, queryWrapper);
 		return Result.ok(pageList);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/SyCertificatesController.java

@@ -8,9 +8,13 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.oa.entity.SyCertificates;
 import org.jeecg.modules.oa.service.ISyCertificatesService;
@@ -48,7 +52,8 @@ import io.swagger.annotations.ApiOperation;
 public class SyCertificatesController extends JeecgController<SyCertificates, ISyCertificatesService> {
 	@Autowired
 	private ISyCertificatesService syCertificatesService;
-	
+	 @Autowired
+	 private ISysBaseAPI sysBaseAPI;
 	/**
 	 * 分页列表查询
 	 *
@@ -66,8 +71,24 @@ public class SyCertificatesController extends JeecgController<SyCertificates, IS
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<SyCertificates> queryWrapper = QueryGenerator.initQueryWrapper(syCertificates, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
 		Page<SyCertificates> page = new Page<SyCertificates>(pageNo, pageSize);
 		IPage<SyCertificates> pageList = syCertificatesService.page(page, queryWrapper);
+		for (SyCertificates o:pageList.getRecords()) {
+
+			if(StringUtils.isNotBlank(o.getUserId())){
+				LoginUser login = sysBaseAPI.getUserByName(o.getUserId());
+				if(login != null){
+					o.setUserId(login.getRealname());
+				}
+			}
+			if(StringUtils.isNotBlank(o.getManageId())){
+				LoginUser login = sysBaseAPI.getUserByName(o.getManageId());
+				if(login != null){
+					o.setManageId(login.getRealname());
+				}
+			}
+		}
 		return Result.ok(pageList);
 	}
 	

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/SyMaterialController.java

@@ -80,6 +80,7 @@ public class SyMaterialController {
 								   HttpServletRequest req) {
 		QueryWrapper<SyMaterial> queryWrapper = QueryGenerator.initQueryWrapper(syMaterial, req.getParameterMap());
 		Page<SyMaterial> page = new Page<SyMaterial>(pageNo, pageSize);
+		queryWrapper.orderByDesc("create_time");
 		IPage<SyMaterial> pageList = syMaterialService.page(page, queryWrapper);
 		return Result.ok(pageList);
 	}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/SyMaterialMapper.xml

@@ -4,11 +4,12 @@
     
     <select id="selectCertEnd" resultType="org.jeecg.modules.oa.entity.SyCertificates">
 
-        select name,id,end_date,notice_month
-        ,user_id -- 证件所有人
-        ,manage_id -- 管理人
-        from sy_certificates
-        where del_flag = 0 and is_message='1' and msg_num > 0 and end_date &lt; DATE_ADD(CURDATE(),INTERVAL notice_month MONTH)
+        select a.name,a.id,a.end_date,a.notice_month
+        ,IFNULL(b.realname,a.manage_id) user_id -- 证件所有人
+        ,a.manage_id -- 管理人
+        from sy_certificates a
+        left join sys_user b on a.user_id = b.username
+        where a.del_flag = 0 and a.is_message='1' and a.msg_num > 0 and a.end_date &lt; DATE_ADD(CURDATE(),INTERVAL a.notice_month MONTH)
 
     </select>
 

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java

@@ -399,4 +399,14 @@ public class SysDepartController {
         }
         return Result.error("文件导入失败！");
     }
+
+
+	@RequestMapping(value = "/queryMyDeptList", method = RequestMethod.GET)
+	public Result<List<SysDepart>> queryMyDeptList() {
+		Result<List<SysDepart>> result = new Result<>();
+		List<SysDepart> departList = this.sysDepartService.queryMyDeptList();
+		result.setResult(departList);
+		result.setSuccess(true);
+		return result;
+	}
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -1,26 +1,21 @@
 package org.jeecg.modules.system.entity;
 
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
-import java.util.Map;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+import java.util.Date;
 
 /**
  * <p>
@@ -313,7 +308,7 @@ public class SysUser implements Serializable {
     @ApiModelProperty(value = "人员类别")
     private java.lang.String nPersonnelType;
     /**简历*/
-    @Excel(name = "简历", width = 15)
+//    @Excel(name = "简历", width = 15)
     @ApiModelProperty(value = "简历")
     private byte[] nResume;
     /**家庭成员*/

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml

@@ -44,10 +44,10 @@
 	   and sa.del_flag = '0'
 	   and sas.user_id = #{announcementSendModel.userId}
 	   <if test="announcementSendModel.titile !=null and announcementSendModel.titile != ''">
-	   		and sa.titile = #{announcementSendModel.titile}
+		   and sa.titile LIKE '%${announcementSendModel.titile}%'
 	   </if>
 	   <if test="announcementSendModel.sender !=null and announcementSendModel.sender != ''">
-	   		and sa.sender = #{announcementSendModel.sender}
+	   		and u.realname LIKE '%${announcementSendModel.sender}%'
 	   </if>
 		<if test="announcementSendModel.pkOrg !=null and announcementSendModel.pkOrg != ''">
 			and sa.pk_org = #{announcementSendModel.pkOrg}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.model.DepartIdModel;
 import org.jeecg.modules.system.model.SysDepartTreeModel;
+
 import java.util.List;
 
 /**
@@ -121,4 +122,6 @@ public interface ISysDepartService extends IService<SysDepart>{
 
     //根据当前人员查询上级部门的负责人
     List<String> getDepartByUsernameByOrg(String username,String orgCode);
+
+    List<SysDepart> queryMyDeptList();
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -1,8 +1,9 @@
 package org.jeecg.modules.system.service.impl;
 
-import java.util.*;
-
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.netty.util.internal.StringUtil;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
@@ -19,10 +20,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import io.netty.util.internal.StringUtil;
+import java.util.*;
 
 /**
  * <p>
@@ -261,6 +259,20 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 		return baseMapper.getDepartByUsernameByOrg(username,orgCode);
 	}
 
+	@Override
+	public List<SysDepart> queryMyDeptList() {
+		LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
+		query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+		query.eq(SysDepart::getOrgType, 2);
+		query.orderByAsc(SysDepart::getDepartOrder);
+		//根据公司id查询编码，通过编码过滤部门
+		LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+		SysDepart sysDepart= this.baseMapper.selectById(sysUser.getOrgCode());
+		query.like(SysDepart::getOrgCode,sysDepart.getOrgCode());
+		List<SysDepart> list = this.list(query);
+		return list;
+	}
+
 	/**
 	 * <p>
 	 * 根据关键字搜索相关的部门数据