Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WxCorpInfoController.java

@@ -50,7 +50,7 @@ public class WxCorpInfoController {
         JSONObject json=new JSONObject();
         JSONArray dataJson=new JSONArray();
         JSONObject jsonObj=new JSONObject();
-        jsonObj.put("key", "提醒");
+        jsonObj.put("key", "提示");
         jsonObj.put("value", "测试提醒消息");
         dataJson.add(jsonObj);
         json.put("template_id","tty9TkCAAAYoevY-40ciWD5lDncDfR5w");

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -322,7 +322,7 @@ public class TimingTask {
                         JSONObject json=new JSONObject();
                         JSONArray dataJson=new JSONArray();
                         JSONObject jsonObj=new JSONObject();
-                        jsonObj.put("key", "提醒");
+                        jsonObj.put("key", "提示");
                         jsonObj.put("value", StringUtils.isEmpty(t.getAlertMsg())?"":t.getAlertMsg());
                         dataJson.add(jsonObj);
                         json.put("template_id","tty9TkCAAAYoevY-40ciWD5lDncDfR5w");

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -221,7 +221,7 @@
         FROM report AS a
         JOIN user AS b ON a.creator_id = b.id
         left join department on department.department_id = b.department_id
-        WHERE a.state = 1 and b.company_id = #{companyId} and a.custom_data > 0
+        WHERE a.state = 1 and b.company_id = #{companyId} and a.custom_data <> 0
         <if test="startDate != null and endDate != null">
             AND a.create_date between #{startDate} and #{endDate}
         </if>
@@ -241,7 +241,7 @@
         JOIN user AS b ON a.creator_id = b.id
         left join department on department.department_id = b.department_id
         left join project on project.id = a.project_id
-        WHERE a.state = 1 and b.company_id = #{companyId}
+        WHERE a.state = 1 and b.company_id = #{companyId} and a.custom_data &lt;&gt; 0
         <if test="startDate != null and endDate != null">
             AND a.create_date between #{startDate} and #{endDate}
         </if>