权限修改

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/AppRecognitionController.java

@@ -49,7 +49,7 @@ public class AppRecognitionController extends BaseController {
     @PostMapping("/getFaceRecognition")
     @SysLog(title = "识别人脸", businessType = OperaType.QUERY, logType = 0, module = "识别服务接口->识别人脸", details = "识别人脸")
     public AjaxResult getFaceRecognition(@RequestPart(value = "file")MultipartFile facePhoto, @RequestParam(value = "params")String params) {
-        params= Sm4Utils.decrypt(params);
+//        params= Sm4Utils.decrypt(params);
         JSONObject jsonObject = FastJsonHelper.jsonStrToJsonObj(params);
         String proId = jsonObject.getString("proId");
         return service.getFaceRecognition(facePhoto,proId);

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java

@@ -9,6 +9,7 @@ import com.bonus.bmw.domain.po.PmProject;
 import com.bonus.bmw.domain.vo.*;
 import com.bonus.bmw.service.PmProjectService;
 import com.bonus.common.core.constant.Constants;
+import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.core.utils.encryption.Sm4Utils;
 import com.bonus.common.core.utils.json.FastJsonHelper;
 import com.bonus.common.core.utils.poi.ExcelUtil;
@@ -33,10 +34,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static com.bonus.bmw.utils.OwnPermissionUtil.dealWithPermission;
 
@@ -196,6 +194,13 @@ public class PmProjectController extends BaseController {
     @SysLog(title = "三表一册", businessType = OperaType.QUERY,  module = "三表一册->三表一册列表")
     public TableDataInfo getThreeForms(ProMonthTable proMonthTable) {
         try {
+            if(StringUtils.isNotEmpty(Collections.singleton(proMonthTable.getSubComId()))){
+                Map<String,String> map = dealWithPermission();
+                if(!map.isEmpty()){
+                    // 3. 将 map 中的值复制到 o 对象中
+                    org.apache.commons.beanutils.BeanUtils.populate(proMonthTable, map);
+                }
+            }
             startPage();
             List<ProMonthTable> res = pmProjectService.getThreeForms(proMonthTable);
             return getDataTable(res);

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubController.java

@@ -80,7 +80,7 @@ public class PmSubController extends BaseController {
             if (res>0){
                 return toAjax(res);
             }else {
-                return error("分包商已存在");
+                return error("其他分公司已建同名分包商，请改一个别名");
             }
         } catch (Exception e) {
             logger.error(e.toString(), e);

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/ProMonthTable.java

@@ -145,4 +145,6 @@ public class ProMonthTable {
      * 工时单价
      */
     private String priceWage;
+
+    public String subComId;
 }

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml

@@ -51,6 +51,7 @@
     WHERE pmp.is_active = 1
     <if test="subComId != null">
       AND pp.sub_com_id = #{subComId}
+      AND pmp.sub_com_id = #{subComId}
     </if>
     <if test="mainProName != null">
       AND locate(#{mainProName},pmp.main_pro_name)
@@ -157,6 +158,9 @@
     <if test="subId != null">
       AND ps.id = #{subId}
     </if>
+    <if test="subComId != null">
+      AND ps.sub_com_id = #{subComId}
+    </if>
     <if test="subName != null and subName != ''">
       AND locate(#{subName},ps.sub_name)
     </if>
@@ -215,6 +219,7 @@
     WHERE
     pst.is_active = 1
     <if test="subComId != null">
+      AND ps.sub_com_id = #{subComId}
       AND pp.sub_com_id = #{subComId}
     </if>
     <if test="teamName != null">

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml

@@ -227,6 +227,9 @@
             <if test="proStatus != null">
                 and pp.pro_status = #{proStatus}
             </if>
+            <if test="subComId != null">
+                and pp.sub_com_id = #{subComId}
+            </if>
         </where>
         group by tpmt.pro_id
     </select>