Antiloveg 8 years ago
parent
commit
7d9e9b64f4

+ 6 - 1
schema/data/permission.sql

@@ -504,4 +504,9 @@ values
 
 insert into `permission`(`id`, `url`, `name`) 
 values
-(UUID(), 'api/admin/deleteHumanResource', '企业人员情况--删除团体人力资源');
+(UUID(), 'api/admin/deleteHumanResource', '企业人员情况--删除团体人力资源');
+
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/cognizanceRecord/search', '高企信息管理--高企信息查询'),
+(UUID(), 'api/admin/cognizanceRecord/import', '高企信息管理--高企信息批量导入');

+ 0 - 3
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -209,7 +209,6 @@ public class PublicController extends BaseController {
 			}
 		} catch (IOException e) {
 			LoggerUtils.fmtError(getClass(), e, "IO错误:%s", e.getMessage());
-			res.getError().add(buildError(ErrorConstants.FILE_NON_EXISTENT));
 		} finally {
 			try {
 				if (null != in) {
@@ -217,7 +216,6 @@ public class PublicController extends BaseController {
 				}
 			} catch (IOException e) {
 				LoggerUtils.fmtError(getClass(), e, "IO错误:%s", e.getMessage());
-				res.getError().add(buildError(ErrorConstants.FILE_NON_EXISTENT));
 			}
 			try {
 				if (null != out) {
@@ -225,7 +223,6 @@ public class PublicController extends BaseController {
 				}
 			} catch (IOException e) {
 				LoggerUtils.fmtError(getClass(), e, "IO错误:%s", e.getMessage());
-				res.getError().add(buildError(ErrorConstants.FILE_NON_EXISTENT));
 			}
 		}
 		return res;

+ 1 - 2
src/main/java/com/goafanti/common/utils/FileUtils.java

@@ -104,8 +104,7 @@ public class FileUtils {
 				|| sign.indexOf("patent_certificate") != -1 || sign.indexOf("standard") != -1
 				|| sign.indexOf("demand_picture") != -1 || sign.indexOf("demand_text_file") != -1
 				|| sign.indexOf("achievement_technical_picture") != -1
-				|| sign.indexOf("achievement_maturity_picture") != -1
-				|| sign.indexOf("demand_order_file") != -1) {
+				|| sign.indexOf("achievement_maturity_picture") != -1 || sign.indexOf("demand_order_file") != -1) {
 			uniq = true;
 		}
 		String fileName = "";