修改bug

industry-system/industry-da/src/main/java/com/example/opc_da/dao/ManualItemDao.java

@@ -12,11 +12,11 @@ import java.util.List;
 public interface ManualItemDao {
 
     List<ManualItem> getManualItemListForTableId(Integer tableTemplateId);
-    List<TableTemplate> getTemplateListHaveManualItem();
-    List<ManualItem> getAllTemplateManualItemList();
+    List<TableTemplate> getTemplateListHaveManualItem(String userId);
+    List<ManualItem> getAllTemplateManualItemList(String userId);
 
-    Integer queryManualItemHistoryDataCount(Integer templateId,Integer itemId,String startTime, String endTime);
-    List<ManualItemData> queryManualItemHistoryData(Integer templateId,Integer itemId,String startTime, String endTime, Integer startNum, Integer limit);
+    Integer queryManualItemHistoryDataCount(String userId,Integer templateId,Integer itemId,String startTime, String endTime);
+    List<ManualItemData> queryManualItemHistoryData(String userId,Integer templateId,Integer itemId,String startTime, String endTime, Integer startNum, Integer limit);
     ManualItem getManualItemForId(Integer tableTemplateId,Integer id);
 
     ManualItem getManualItemForName(Integer tableTemplateId,String fieldName);

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/ManualItemServiceImpl.java

@@ -175,24 +175,33 @@ public class ManualItemServiceImpl implements ManualItemService {
     }
     @Override
     public Result getTemplateListHaveManualItem(){
+        //获得当前用户
+        String userId = userUtil.getCurrentUserId();
+
         JSONObject jsonObject = new JSONObject();
-        List<TableTemplate> list = manualItemDao.getTemplateListHaveManualItem();
+        List<TableTemplate> list = manualItemDao.getTemplateListHaveManualItem(userId);
         jsonObject.put("templateList", list);
         return Result.ok(jsonObject);
     }
     @Override
     public Result getAllTemplateManualItemList(){
+        //获得当前用户
+        String userId = userUtil.getCurrentUserId();
+
         JSONObject jsonObject = new JSONObject();
-        List<ManualItem> list = manualItemDao.getAllTemplateManualItemList();
+        List<ManualItem> list = manualItemDao.getAllTemplateManualItemList(userId);
         jsonObject.put("manualList", list);
         return Result.ok(jsonObject);
     }
     @Override
     public Result queryManualItemHistoryData(Integer templateId,Integer itemId,String startTime, String endTime, Integer page, Integer limit){
+        //获得当前用户
+        String userId = userUtil.getCurrentUserId();
+
         JSONObject jsonObject = new JSONObject();
-        Integer count = manualItemDao.queryManualItemHistoryDataCount(templateId,itemId,startTime,endTime);
+        Integer count = manualItemDao.queryManualItemHistoryDataCount(userId,templateId,itemId,startTime,endTime);
         Integer startNum = (page - 1) * limit;
-        List<ManualItemData> list = manualItemDao.queryManualItemHistoryData(templateId,itemId,startTime,endTime,startNum,limit);
+        List<ManualItemData> list = manualItemDao.queryManualItemHistoryData(userId,templateId,itemId,startTime,endTime,startNum,limit);
         jsonObject.put("count", count);
         jsonObject.put("manualDataList", list);
         return Result.ok(jsonObject);

industry-system/industry-da/src/main/resources/mapper/ManualItemDao.xml

@@ -15,18 +15,24 @@
         order by id
     </select>
     <select id="getTemplateListHaveManualItem" resultType="com.example.opc_common.entity.TableTemplate">
-        select DISTINCT t.id,t.template_name from t_table_template t INNER JOIN t_table_manualitem m on m.table_template_id=t.id
+        select DISTINCT t.id,t.template_name
+        from t_table_template t INNER JOIN t_table_manualitem m on m.table_template_id=t.id
+        where t.user_id=#{userId}
     </select>
     <select id="getAllTemplateManualItemList" resultType="com.example.opc_common.entity.ManualItem">
         select m.table_template_id,m.id,m.fieldname,t.template_name remark from t_table_template t
         INNER JOIN t_table_manualitem m on m.table_template_id=t.id
+        Where t.user_id=#{userId}
     </select>
     <select id="queryManualItemHistoryDataCount" resultType="java.lang.Integer">
         select count(*) from t_report_manualdata m
         LEFT OUTER JOIN t_report_table r on m.ch_report_id=r.id
         LEFT OUTER JOIN t_table_template t on t.id=m.table_template_id
         LEFT OUTER JOIN sys_user u on u.user_id=m.user_id
-        where m.ch_report_id is not null
+        where 1=1
+        <if test="userId != null and userId != ''">
+            AND t.user_id = #{userId}
+        </if>
         <if test="templateId != null and templateId != 0">
             AND m.table_template_id = #{templateId}
         </if>
@@ -45,7 +51,10 @@
         LEFT OUTER JOIN t_report_table r on m.ch_report_id=r.id
         LEFT OUTER JOIN t_table_template t on t.id=m.table_template_id
         LEFT OUTER JOIN sys_user u on u.user_id=m.user_id
-        where m.ch_report_id is not null
+        where 1=1
+        <if test="userId != null and userId != ''">
+            AND t.user_id = #{userId}
+        </if>
         <if test="templateId != null and templateId != 0">
             AND m.table_template_id = #{templateId}
         </if>

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/item-list-table.js

@@ -450,10 +450,10 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil','ite
 								</div>
 							</div>
 							<div class="layui-inline">
-								<button lay-on="data-item-addManual-btn" type="button" class="layui-btn layui-btn-sm ${fn.data.type == 'edit'? '' : 'layui-hide'}">添加手动录入项</button>
 								<button lay-on="data-item-add-btn" type="button" class="layui-btn layui-btn-sm ${fn.data.type == 'edit'? '' : 'layui-hide'}">添加点位</button>
-								<button lay-on="data-item-switchManual-btn" type="button" class="layui-btn layui-btn-sm ${fn.data.type == 'edit'? 'layui-hide' : ''}">选择手动录入项</button>
+								<button lay-on="data-item-addManual-btn" type="button" class="layui-btn layui-btn-sm ${fn.data.type == 'edit'? '' : 'layui-hide'}">添加手动录入项</button>
 								<button lay-on="data-item-switch-btn" type="button" class="layui-btn layui-btn-sm ${fn.data.type == 'edit'? 'layui-hide' : ''}">选择点位</button>
+								<button lay-on="data-item-switchManual-btn" type="button" class="layui-btn layui-btn-sm ${fn.data.type == 'edit'? 'layui-hide' : ''}">选择手动录入项</button>
 								<button lay-on="data-item-setting-btn" type="button" class="layui-btn layui-btn-sm">设置数据条件</button>
 								<button lay-on="data-item-del-btn" type="button" class="layui-btn layui-btn-sm layui-btn-danger"><i class="layui-icon layui-icon-delete"></i>批量删除</button>
 							</div>