Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java

@@ -141,6 +141,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 		WxResult<String> result = new WxResult<>();
 		String url = WxMaCodeConstant.SUBMIT_AUDIT_URL + "?" + "access_token=" + accessToken;
 		Result<String> submitResult = HttpClientManager.getInstance().sendPostByJSON(url, toJson(auditRequest));
+		log.info("submitAudit result:{}",JSON.toJSONString(submitResult));
 		if (!submitResult.success()) {
 			result.setErrorCode(submitResult.getCode());
 			result.setErrorMsg(submitResult.getMsg());

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml

@@ -32,7 +32,7 @@
             CONCAT(cd.category_name,'-',ip.category_name) AS "name"
         FROM
             issue_project_category_dict ip
-        INNER JOIN issue_project_category_dict cd ON ip.pid = cd.id
+        INNER JOIN issue_project_category_dict cd ON ip.pid = cd.id AND ip.customer_id = cd.customer_id
         WHERE
             ip.del_flag = '0'
         AND cd.DEL_FLAG = '0'
@@ -81,4 +81,4 @@
             issue_id = #{issueId}
     </delete>
 
-</mapper>
+</mapper>

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java

@@ -2,6 +2,7 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
@@ -19,5 +20,6 @@ public class PageUserReportEventFormDTO implements Serializable {
     private Integer pageNo;
     @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class)
     private Integer pageSize;
-
+    @NotBlank(message = "userId不能为空" , groups = AddUserInternalGroup.class)
+    private String userId;
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java

@@ -26,7 +26,7 @@ public class ProjectApprovalFormDTO implements Serializable {
     @NotBlank(message = "项目方案不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class})
     @Length(max=1000,message = "项目方案不能超过1000位",groups = {ProjectApprovalFormDTO.ApprovalCategory.class})
     private String publicReply;
-    @NotBlank(message = "内部备注不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class})
+    // @NotBlank(message = "内部备注不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class})
     @Length(max=1000,message = "内部备注不能超过1000位",groups = {ProjectApprovalFormDTO.ApprovalCategory.class})
     private String internalRemark;
     //定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java

@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 
@@ -35,7 +34,7 @@ public class ProjectResponseFormDTO implements Serializable {
 	/**
 	 * 内部流转意见
 	 */
-	@NotBlank(message = "内部备注不能为空")
+	// @NotBlank(message = "内部备注不能为空")
 	@Length(max = 1000, message = "内部备注不能超过1000个字符")
 	private String internalRemark;
 	/**

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java

@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 
@@ -36,7 +35,7 @@ public class ReturnFromDTO implements Serializable {
 	/**
 	 * 内部流转意见
 	 */
-	@NotBlank(message = "内部备注不能为空")
+	// @NotBlank(message = "内部备注不能为空")
 	@Length(max = 1000, message = "内部备注不能超过1000个字符")
 	private String internalRemark;
 	/**

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SendToFormDTO.java

@@ -25,7 +25,7 @@ public class SendToFormDTO implements Serializable {
 	@Length(max=1000,message = "公开答复内容不能超过1000位")
 	private String publicReply;
 
-	@NotBlank(message = "内部备注不能为空")
+	// @NotBlank(message = "内部备注不能为空")
 	@Length(max=1000,message = "内部备注不能超过1000位")
 	private String internalRemark;
 

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java

@@ -25,7 +25,7 @@ public class TransferFormDTO implements Serializable {
     @Length(max=1000,message = "公开答复内容不能超过1000位")
     private String publicReply;
 
-    @NotBlank(message = "内部备注不能为空")
+    // @NotBlank(message = "内部备注不能为空")
     @Length(max=1000,message = "内部备注不能超过1000位")
     private String internalRemark;
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -1617,9 +1617,15 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
 
     @Override
     public PageData<PageUserReportEventResDTO> icEventPageUserReported(PageUserReportEventFormDTO formDTO) {
-        if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) {
-            return new PageData<PageUserReportEventResDTO>(new ArrayList<>(), NumConstant.ZERO);
-        }
+        // if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) {
+        //     return new PageData<PageUserReportEventResDTO>(new ArrayList<>(), NumConstant.ZERO);
+        // }
+        List<String> epmetUserIdList=new ArrayList<>();
+        epmetUserIdList.add(formDTO.getUserId());
+        if(!CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){
+            epmetUserIdList.addAll(formDTO.getEpmetUserIdList());
+        }
+        formDTO.setEpmetUserIdList(epmetUserIdList);
         PageInfo<PageUserReportEventResDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserReported(formDTO));
         return new PageData<>(pageInfo.getList(), pageInfo.getTotal());

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -268,8 +268,8 @@
         <where>
             <include refid="listWhereForPage"></include>
         </where>
-        group by IC_RESI_USER.id
         <if test="null != groupByTables and groupByTables.size() > 0">
+            group by IC_RESI_USER.id
             <foreach item="groupTableName" collection="groupByTables" open="," separator="," close="">
                 ${groupTableName}.ID
             </foreach>