Merge remote-tracking branch 'cs/master'

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectDocumentManagerImpl.java

@@ -589,7 +589,8 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
             //生成文书
             Map<String,String> map = new HashMap<>();
             list.stream().forEach(p->{
-                map.put("{"+p.getOriginalText()+"}", HtmlUtils.stripHtmlFast(p.getDataValue()) );
+                //map.put("{"+p.getOriginalText()+"}", HtmlUtils.stripHtmlFast(p.getDataValue()) );
+                map.put("{"+p.getOriginalText()+"}", p.getDataValue());
             });
             //先处理一种文件
             String templatePath = costDocumentTemplate.getFileUrl().replace(BaseConstant.RESOURCE_PREFIX,"");

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostSurveyTemplateController.java

@@ -244,6 +244,17 @@ public class CostSurveyTemplateController extends BaseController<CostSurveyTempl
     public CommonResult<List<CostSurveyTemplate>> listFixedEnabled(
             @ApiParam(name = "catalogId", value = "模板ID", required = false) @RequestParam (value="catalogId") String catalogId) throws Exception {
         CostSurveyTemplate queryCondition = new CostSurveyTemplate();
+        IUser user = ContextUtil.getCurrentUser();
+        User account = userService.getByAccount(user.getAccount());
+        if (account!=null ) {
+            if (account.getDataScope()==0) {
+                queryCondition.setAreaCode(account.getProvinceCode());
+            } else if (account.getDataScope()==1) {
+                queryCondition.setAreaCode(account.getCityCode());
+            }else {
+                queryCondition.setAreaCode(account.getCountyCode());
+            }
+        }
         queryCondition.setStatus("0"); // 启用状态
         queryCondition.setTemplateType("2"); // 模板类型为固定表
         queryCondition.setCatalogId(catalogId);

assistMg/src/main/resources/mapper/CostSurveyTemplateMapper.xml

@@ -63,6 +63,9 @@
 			<if test="costSurveyTemplate.type != null and costSurveyTemplate.type != ''">
 				AND type = #{costSurveyTemplate.type}
 			</if>
+			<if test="costSurveyTemplate.areaCode != null and costSurveyTemplate.areaCode != ''">
+				AND area_code = #{costSurveyTemplate.areaCode}
+			</if>
 			AND is_delete = 0
 		</where>
 	</select>