Browse Source

部门新增技术总监开发

anderx 1 year ago
parent
commit
9219c64834

+ 9 - 0
src/main/java/com/goafanti/admin/bo/AdminListBo.java

@@ -130,6 +130,15 @@ public class AdminListBo {
 	private String ambName;
 	private String ancestorsNames;
 	private String ambRole;
+	private String publicCarbonCopy;
+
+	public String getPublicCarbonCopy() {
+		return publicCarbonCopy;
+	}
+
+	public void setPublicCarbonCopy(String publicCarbonCopy) {
+		this.publicCarbonCopy = publicCarbonCopy;
+	}
 
 	public Integer getExpenseSuperExamine() {
 		return expenseSuperExamine;

+ 2 - 1
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -838,7 +838,8 @@
 
     <select id="getDeptNameByAid" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
         select a.id,a.name, d.name as departmentName,a.department_id departmentId,a.email,a.superior_id superiorId,a.open_id openId,
-               a.reviewer,d.manager_id depManager,d.finance_id depFinance,a.public_purview publicPurview,a.expense_super_examine expenseSuperExamine
+               a.reviewer,d.manager_id depManager,d.finance_id depFinance,a.public_purview publicPurview,a.expense_super_examine expenseSuperExamine,
+               a.public_carbon_copy publicCarbonCopy
         from admin a left join department d on a.department_id = d.id
         where a.id = #{_parameter,jdbcType=VARCHAR}
     </select>

+ 5 - 3
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -158,9 +158,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		updateName.setUserNames(userNames);
 		publicReleaseMapper.updateByPrimaryKeySelective(updateName);
 		addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
-		asyncUtils.addNoticAndEmail(NoticeStatus.MENBER_START.getCode(),TokenManager.getAdminId()
-				,String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),in.getReleaseStart(),in.getReleaseEnd(),
-				userNames));
+		if (StringUtils.isNotEmpty(my.getPublicCarbonCopy())){
+			asyncUtils.addNoticAndEmail(NoticeStatus.MENBER_START.getCode(),my.getPublicCarbonCopy()
+					,String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),in.getReleaseStart(),in.getReleaseEnd(),
+							userNames));
+		}
         return (Map<String, Object>) addPublicReleaseLog(my, in,userNames,date,users,checkOrderNo);
 	}